*粒子系统

1 files changed, 1 insertions, 12 deletions

diff --git a/src/lua/modules/graphics/je_lua_sprite.cpp b/src/lua/modules/graphics/je_lua_sprite.cpp
index 97128a9..76d6c1f 100644
--- a/src/lua/modules/graphics/je_lua_sprite.cpp
+++ b/src/lua/modules/graphics/je_lua_sprite.cpp
@@ -91,16 +91,6 @@ namespace JinEngine
             return 0;
         }
 
-        LUA_IMPLEMENT int l_setShader(lua_State* L)
-        {
-            SharedSprite sprite = checkSprite(L);
-            Proxy* proxy = (Proxy*)luax_checktype(L, 2, Jin_Lua_Shader);
-            Shader* shader = proxy->getObject<Shader>();
-            sprite->setShader(shader);
-            sprite.setDependency((int)SpriteDependency::DEP_SHADER, &proxy->getShared<Shader>());
-            return 0;
-        }
-
         LUA_IMPLEMENT int l_setGraphic(lua_State* L)
         {
             SharedSprite sprite = checkSprite(L);
@@ -164,7 +154,7 @@ namespace JinEngine
         LUA_IMPLEMENT int l_getOrigin(lua_State* L)
         {
             SharedSprite sprite = checkSprite(L);
-            const Math::Vector2<int>& origin = sprite->getOrigin();
+            const Math::Vector2<float>& origin = sprite->getOrigin();
             luax_pushinteger(L, origin.x);
             luax_pushinteger(L, origin.y);
             return 2;
@@ -241,7 +231,6 @@ namespace JinEngine
                 { "setPosition", l_setPosition },
                 { "setScale",    l_setScale    },
                 { "setColor",    l_setColor    },
-                { "setShader",   l_setShader   },
                 { "setGraphic",  l_setGraphic  },
                 { "move",        l_move        },
                 { "scale",       l_scale       },