Added more setTexture overload

Author: eduardodoria

engine/core/object/Mesh.cpp

@@ -38,6 +38,14 @@ void Mesh::setTexture(const std::string& path){
     mesh.submeshes[0].needUpdateTexture = true;
 }
 
+void Mesh::setTexture(const std::string& id, TextureData data){
+    MeshComponent& mesh = getComponent<MeshComponent>();
+
+    mesh.submeshes[0].material.baseColorTexture.setData(id, data);
+
+    mesh.submeshes[0].needUpdateTexture = true;
+}
+
 void Mesh::setTexture(Framebuffer* framebuffer){
     MeshComponent& mesh = getComponent<MeshComponent>();
 

engine/core/object/Mesh.h

@@ -20,6 +20,7 @@ namespace Supernova{
         bool load();
 
         void setTexture(const std::string& path);
+        void setTexture(const std::string& id, TextureData data);
         void setTexture(Framebuffer* framebuffer);
 
         void setColor(Vector4 color);

engine/core/object/Points.cpp

@@ -232,6 +232,14 @@ void Points::setTexture(const std::string& path){
     pointscomp.needUpdateTexture = true;
 }
 
+void Points::setTexture(const std::string& id, TextureData data){
+    PointsComponent& pointscomp = getComponent<PointsComponent>();
+
+    pointscomp.texture.setData(id, data);
+
+    pointscomp.needUpdateTexture = true;
+}
+
 void Points::setTexture(Framebuffer* framebuffer){
     PointsComponent& pointscomp = getComponent<PointsComponent>();
 

engine/core/object/Points.h

@@ -57,6 +57,7 @@ namespace Supernova{
         void removeSpriteFrame(const std::string& name);
 
         void setTexture(const std::string& path);
+        void setTexture(const std::string& id, TextureData data);
         void setTexture(Framebuffer* framebuffer);
     };
 }

engine/core/object/ui/Image.cpp

@@ -121,6 +121,14 @@ void Image::setTexture(const std::string& path){
     ui.needUpdateTexture = true;
 }
 
+void Image::setTexture(const std::string& id, TextureData data){
+    UIComponent& ui = getComponent<UIComponent>();
+
+    ui.texture.setData(id, data);
+
+    ui.needUpdateTexture = true;
+}
+
 void Image::setTexture(Framebuffer* framebuffer){
     UIComponent& ui = getComponent<UIComponent>();
 

engine/core/object/ui/Image.h

@@ -31,6 +31,7 @@ namespace Supernova{
         unsigned int getPatchMarginTop() const;
 
         void setTexture(const std::string& path);
+        void setTexture(const std::string& id, TextureData data);
         void setTexture(Framebuffer* framebuffer);
 
         void setTextureScaleFactor(float textureScaleFactor);

engine/core/object/ui/Polygon.cpp

@@ -64,6 +64,14 @@ void Polygon::setTexture(const std::string& path){
     ui.needUpdateTexture = true;
 }
 
+void Polygon::setTexture(const std::string& id, TextureData data){
+    UIComponent& ui = getComponent<UIComponent>();
+
+    ui.texture.setData(id, data);
+
+    ui.needUpdateTexture = true;
+}
+
 void Polygon::setTexture(Framebuffer* framebuffer){
     UIComponent& ui = getComponent<UIComponent>();
 

engine/core/object/ui/Polygon.h

@@ -24,6 +24,7 @@ namespace Supernova{
         void clearVertices();
 
         void setTexture(const std::string& path);
+        void setTexture(const std::string& id, TextureData data);
         void setTexture(Framebuffer* framebuffer);
 
         void setColor(Vector4 color);

engine/core/script/binding/ObjectClassesLua.cpp

@@ -298,6 +298,7 @@ void LuaBinding::registerObjectClasses(lua_State *L){
         .addConstructor <void (*) (Scene*)> ()
         .addFunction("setTexture", 
             luabridge::overload<const std::string&>(&Mesh::setTexture),
+            luabridge::overload<const std::string&,TextureData>(&Mesh::setTexture),
             luabridge::overload<Framebuffer*>(&Mesh::setTexture))
         .addProperty("color", &Mesh::getColor, (void(Mesh::*)(Vector4))&Mesh::setColor)
         .addFunction("setColor", 
@@ -526,6 +527,7 @@ void LuaBinding::registerObjectClasses(lua_State *L){
             luabridge::overload<const std::string&>(&Points::removeSpriteFrame))
         .addFunction("setTexture", 
             luabridge::overload<const std::string&>(&Points::setTexture),
+            luabridge::overload<const std::string&,TextureData>(&Points::setTexture),
             luabridge::overload<Framebuffer*>(&Points::setTexture))
         .endClass();
 
@@ -632,6 +634,7 @@ void LuaBinding::registerObjectClasses(lua_State *L){
         .addProperty("alpha", &Polygon::getAlpha, &Polygon::setAlpha)
         .addFunction("setTexture", 
             luabridge::overload<const std::string&>(&Polygon::setTexture),
+            luabridge::overload<const std::string&,TextureData>(&Polygon::setTexture),
             luabridge::overload<Framebuffer*>(&Polygon::setTexture))
         .addProperty("flipY", &Polygon::isFlipY, &Polygon::setFlipY)
         .addFunction("getAABB", &Polygon::getAABB)
@@ -679,6 +682,7 @@ void LuaBinding::registerObjectClasses(lua_State *L){
         .addProperty("patchMarginTop", &Image::getPatchMarginTop, &Image::setPatchMarginTop)
         .addFunction("setTexture", 
             luabridge::overload<const std::string&>(&Image::setTexture),
+            luabridge::overload<const std::string&,TextureData>(&Image::setTexture),
             luabridge::overload<Framebuffer*>(&Image::setTexture))
         .addProperty("textureScaleFactor", &Image::getTextureScaleFactor, &Image::setTextureScaleFactor)
         .addProperty("color", &Image::getColor, (void(Image::*)(Vector4))&Image::setColor)