*lua bind

5 files changed, 20 insertions, 43 deletions

diff --git a/src/libjin/graphics/je_graphic.cpp b/src/libjin/graphics/je_graphic.cpp
index a01526e..6cd05a1 100644
--- a/src/libjin/graphics/je_graphic.cpp
+++ b/src/libjin/graphics/je_graphic.cpp
@@ -137,32 +137,6 @@ namespace JinEngine
         //    glTexParameteri(GL_)
         //}
 
-        Shaders::Shader* Graphic::getDefaultShader()
-        {
-            const char* default_shader = R"(
-            #VERTEX_SHADER
-
-            Vertex vert(Vertex v)
-            {
-                return v;
-            }
-
-            #END_VERTEX_SHADER
-
-            #FRAGMENT_SHADER
-
-            Color frag(Color col, Texture tex, Vertex v)
-            {
-                return col * texel(tex, v.uv);
-            }
-
-            #END_FRAGMENT_SHADER
-            )";
-            static Shader* shader = Shader::createShader(default_shader);
-            if(shader != nullptr)
-            return shader;
-        }
-
     } // namespace Graphics
 } // namespace JinEngine
 
diff --git a/src/libjin/graphics/je_graphic.h b/src/libjin/graphics/je_graphic.h
index 53eacee..90b5522 100644
--- a/src/libjin/graphics/je_graphic.h
+++ b/src/libjin/graphics/je_graphic.h
@@ -85,8 +85,6 @@ namespace JinEngine
             Math::Vector2<uint> mSize;
 
         private:
-            static Shaders::Shader* getDefaultShader();
-
             GLuint mTexture;
 
         };
diff --git a/src/libjin/graphics/je_renderable.h b/src/libjin/graphics/je_renderable.h
index 0e29556..ca9888e 100644
--- a/src/libjin/graphics/je_renderable.h
+++ b/src/libjin/graphics/je_renderable.h
@@ -24,14 +24,14 @@ namespace JinEngine
         class Renderable
         {
         public:
-            void setShader(const Shaders::Shader* shader);
+            //void setShader(const Shaders::Shader* shader);
 
             virtual void render(float x, float y, float sx, float sy, float r) const {};
             virtual void render(float x, float y, float sx, float sy, float r, float ox, float oy) const {};
             virtual void render(float x, float y, float sx, float sy, float r, Origin origin) const {};
 
         protected:
-            const Shaders::Shader* mShader;
+            //const Shaders::Shader* mShader;
 
         };
 
diff --git a/src/lua/common/je_lua_shared.cpp b/src/lua/common/je_lua_shared.cpp
index b95d1a0..076f176 100644
--- a/src/lua/common/je_lua_shared.cpp
+++ b/src/lua/common/je_lua_shared.cpp
@@ -6,6 +6,19 @@ namespace JinEngine
     namespace Lua
     {
 
+        SharedBase::SharedBase(lua_State* L, void* obj, const char* t)
+            : mCount(0)
+            , mObject(obj)
+            , mL(L)
+            , mType(t)
+        {
+        }
+
+        SharedBase::~SharedBase()
+        {
+            clearDependencies();
+        }
+
         void SharedBase::retain()
         {
             ++mCount;
@@ -87,7 +100,7 @@ namespace JinEngine
             return strcmp(mType, t) == 0;
         }
 
-        int SharedBase::getDependencyCount()
+        int SharedBase::getDependenciesCount()
         {
             return mDependencies.size();
         }
diff --git a/src/lua/common/je_lua_shared.hpp b/src/lua/common/je_lua_shared.hpp
index c4b70de..5b1d329 100644
--- a/src/lua/common/je_lua_shared.hpp
+++ b/src/lua/common/je_lua_shared.hpp
@@ -38,25 +38,17 @@ namespace JinEngine
 
             bool isType(const char* t);
 
-            int getDependencyCount();
+            int getDependenciesCount();
 
             const char* getType();
 
         protected:
-            SharedBase(lua_State* L, void* obj, const char* t)
-                : mCount(0)
-                , mObject(obj)
-                , mL(L)
-                , mType(t)
-            {
-            }
+            SharedBase(lua_State* L, void* obj, const char* t);
 
+            // Disable shared.
             SharedBase(const SharedBase&);
 
-            virtual ~SharedBase()
-            {
-                clearDependencies();
-            }
+            virtual ~SharedBase();
 
             using DepsMap = std::map<int, SharedBase*>;