some minor adjustments

Author: flipcoder

qor.make

@@ -74,6 +74,7 @@ OBJECTS := \
 	$(OBJDIR)/Mesh.o \
 	$(OBJDIR)/Material.o \
 	$(OBJDIR)/Main.o \
+	$(OBJDIR)/DynamicTyping.o \
 	$(OBJDIR)/Engine.o \
 	$(OBJDIR)/DummyPartitioner.o \
 	$(OBJDIR)/TrackerNode.o \
@@ -200,6 +201,9 @@ $(OBJDIR)/Material.o: src/Material.cpp
 $(OBJDIR)/Main.o: src/Main.cpp
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+$(OBJDIR)/DynamicTyping.o: src/DynamicTyping.cpp
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 $(OBJDIR)/Engine.o: src/Engine.cpp
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"

qor.vcxproj

@@ -150,6 +150,7 @@
 		<ClInclude Include="src\Shadow.h" />
 		<ClInclude Include="src\Node.h" />
 		<ClInclude Include="src\DummyPartitioner.h" />
+		<ClInclude Include="src\DynamicTyping.h" />
 		<ClInclude Include="src\IStateManager.h" />
 		<ClInclude Include="src\IRealtime.h" />
 		<ClInclude Include="src\GUI.h" />
@@ -165,7 +166,6 @@
 		<ClInclude Include="src\Console.h" />
 		<ClInclude Include="src\RenderBuffer.h" />
 		<ClInclude Include="src\ISuperParent.h" />
-		<ClInclude Include="src\Rules.h" />
 		<ClInclude Include="src\IStaticInstance.h" />
 		<ClInclude Include="src\Util.h" />
 		<ClInclude Include="src\IFallible.h" />
@@ -206,6 +206,8 @@
 		</ClCompile>
 		<ClCompile Include="src\Main.cpp">
 		</ClCompile>
+		<ClCompile Include="src\DynamicTyping.cpp">
+		</ClCompile>
 		<ClCompile Include="src\Engine.cpp">
 		</ClCompile>
 		<ClCompile Include="src\DummyPartitioner.cpp">

src/DynamicTyping.cpp

@@ -0,0 +1,13 @@
+#include "DynamicTyping.h"
+
+unsigned int DynamicContext :: inherit(std::string name, std::vector<unsigned int> types)
+{
+    // TODO: 
+    return 0;
+}
+
+bool DynamicContext :: isType(unsigned int type, unsigned int type_cmp)
+{
+    return false;
+}
+

src/Rules.h renamed to src/DynamicTyping.h

@@ -1,40 +1,44 @@
-#ifndef _RULES_H
-#define _RULES_H
+#ifndef _DYNAMICTYPING_H
+#define _DYNAMICTYPING_H
+
+// Provides dynamic classification (attributes, flags, inheritence) of objects for
+//  scripting.  Users can define types and flags and tag them to existing scriptable
+//  objects for better user game logic.
 
 #include <vector>
+#include <map>
+#include <algorithm>
 #include <boost/dynamic_bitset.hpp>
-// Rules
-//  Lays out the game mechanics, items, weapons, and provides scriptable interface to them
+#include "IScriptable.h"
 
-// eventually stuff like this (less stringly tho, using ID system preferably):
 //  rules->addType("rocket")
 //  rules->classSpec("rocket")->inherit("ammo")
 //  inventory->addItem("rocket", 5);
 //  if (inventory->anyOfType("ammo")) {
 //    // etc...
 //  }
 
-class ClassSpec
+class DynamicType
 {
     public:
 
-        ClassSpec(const std::string& name):
+        DynamicType(const std::string& name):
             m_sName(name)
         {}
-        virtual ~ClassSpec() {}
+        virtual ~DynamicType() {}
 
         bool inherit(unsigned int id) {
-            if(m_Types.find(id) != m_Types.end())
+            if(std::find(m_Types.begin(), m_Types.end(), id) != m_Types.end())
                 return false;
             m_Types.push_back(id);
-                return true;
+            return true;
         }
         unsigned int id() const { return m_ID; }
         const std::string& name() const { return m_sName; }
 
     private:
 
-        unsigned int m_ID; // ID of type, also index in Rules' class member m_Types
+        unsigned int m_ID; // ID of type, also index in DynamicContext' class member m_Types
 
         std::string m_sName; // name for scripting and lookup
         std::vector<unsigned int> m_Types; // inherited type info
@@ -45,24 +49,24 @@ class ClassSpec
 
         boost::dynamic_bitset<> m_Flags;
         std::map<unsigned int, std::string> m_FlagNames;
-}
+};
 
-class Rules : public IScriptable
+class DynamicContext : public IScriptable
 {
     private:
 
     public:
 
-        std::vector<ClassSpec> m_Types; // indexed by type id (array position)
+        std::vector<DynamicType> m_Types; // indexed by type id (array position)
 
-        Rules(std::string fn):
+        DynamicContext(std::string fn):
             IScriptable(fn)
         {
-            m_Types.push_back(ClassSpec("object"));
+            m_Types.push_back(DynamicType("object"));
         }
-        virtual ~Rules() {}
+        virtual ~DynamicContext() {}
 
-        unsigned int addType(ClassSpec spec) {
+        unsigned int addType(DynamicType spec) {
             m_Types.push_back(spec);
             return m_Types.size()-1;
         }
@@ -71,24 +75,19 @@ class Rules : public IScriptable
             for(auto itr = m_Types.begin();
                 itr != m_Types.end();
                 ++itr)
-            if(spec.name() == name)
+            if(itr->name() == name)
                 return 0;
             else
                 return itr->id();
         }
 
         // makes a new type that inherits from other types
-        unsigned int inherit(std::string name, std::vector<unsigned int> types) {
-            // TODO: 
-            return 0;
-        }
+        unsigned int inherit(std::string name, std::vector<unsigned int> types);
 
         // deep lookup if a type matches another type
         //  warning: one-way relationship possible here
         //  square is rectangle, rectangle is not always square, etc.
-        bool isType(unsigned int type) const {
-            
-        }
+        bool isType(unsigned int type, unsigned int type_cmp);
 };
 
 #endif

src/IScriptable.h

@@ -2,6 +2,7 @@
 #define _SCRIPTABLE_H
 
 #include <string>
+#include "IConfig.h"
 
 class IScriptable: public IConfig
 {

src/Mesh.h

@@ -44,7 +44,6 @@ class Mesh : public IRealtime
     std::vector<std::vector<glm::vec3>> UVs;
 
     std::vector<std::shared_ptr<Mesh>> LOD;
-    std::map<std::pair<std::weak_ptr<Node>, std::weak_ptr<Light>>, Shadow> shadows;
 
     float minimum_lod;
     bool error;

src/RenderBuffer.h

@@ -15,7 +15,7 @@ class RenderBuffer
     unsigned int height;
 
 public:
-    RenderBuffer(int _width, int _height){
+    RenderBuffer(int _width, int _height) {
         m_FrameBufferID = 0;
         m_DepthBufferID = 0;
         m_Status = 0;
@@ -38,7 +38,7 @@ class RenderBuffer
         status();
         ASSERT(m_Status == GL_FRAMEBUFFER_COMPLETE);
     }
-    virtual ~RenderBuffer(){
+    virtual ~RenderBuffer() {
         if(m_FrameBufferID)
             glDeleteFramebuffers(1, &m_FrameBufferID);
         if(m_DepthBufferID)

src/Shadow.cpp

@@ -1,48 +1,3 @@
-#include "math/common.h"
 #include "Shadow.h"
-#include "Log.h"
-#include "Node.h"
-#include "Mesh.h"
-#include "Light.h"
-using namespace std;
 
-//Shadow :: Shadow(Node* mesh_node, Mesh& mesh_ref, const Light& light_ref)
-Shadow :: Shadow(weak_ptr<Node>& mesh_node_ref, weak_ptr<Mesh>& mesh_ref, weak_ptr<Light>& light_ref)
-{
-    m_bValid = false;
-    
-    try
-    {
-        // set members
-        m_wpNode = mesh_node_ref;
-        m_wpMesh = mesh_ref;
-        m_wpLight = light_ref;
-        
-        // acquire shared_ptrs from weak_ptrs
-        SharedData shared_data(m_wpNode, m_wpMesh, m_wpLight);
-        if(!shared_data.valid())
-            throw false;
-        
-        // Get matricies so we can get all the vectors into world space
-        glm::mat4 node_matrix = *shared_data.node->matrix_c(Space::WORLD);
-        glm::mat4 light_matrix = *shared_data.light->matrix_c(Space::WORLD);
-        
-        // now we go through the mesh and detect edges
-        if(!generateEdges(shared_data))
-            throw false;
-    }
-    catch(bool v)
-    {
-        m_bValid = v;
-    }
-    catch(...)
-    {
-        m_bValid = false;
-    }
-}
-
-bool Shadow :: generateEdges(Shadow::SharedData& shared_data)
-{
-    return false;
-}
 

src/Shadow.h

@@ -1,50 +1,19 @@
 #ifndef _SHADOW_H
 #define _SHADOW_H
 
-#include <memory>
-#include "Node.h"
-#include "Mesh.h"
-#include "Light.h"
+#include <vector>
+#include "RenderBuffer.h"
 
-class Mesh;
-class Light;
-
-class Shadow
+class ShadowBuffer
 {
-public:
-    
-    class SharedData
-    {
+    private:
+
+        std::vector<RenderBuffer> m_Buffers;
+
     public:
-        SharedData(
-                std::weak_ptr<Node> n,
-                std::weak_ptr<Mesh> m,
-                std::weak_ptr<Light> l
-            ):
-            node(n),
-            mesh(m),
-            light(l)
-        {}
-        std::shared_ptr<Node> node;
-        std::shared_ptr<Mesh> mesh;
-        std::shared_ptr<Light> light;
-        bool valid() {return node && mesh && light;}
-    };
-    
-    Shadow(std::weak_ptr<Node>& mesh_node, std::weak_ptr<Mesh>& mesh_ref, std::weak_ptr<Light>& light_ref);
-    //~Shadow();
 
-    bool generateEdges(SharedData& shared_data);
-    bool good() { return m_bValid; }
-    
-private:
-    std::vector<glm::vec3> m_vEdges;
-    
-    std::weak_ptr<Node> m_wpNode;
-    std::weak_ptr<Mesh> m_wpMesh;
-    std::weak_ptr<Light> m_wpLight;
-    
-    bool m_bValid;
+        ShadowBuffer() {}
+        virtual ~ShadowBuffer() {}
 };
 
 #endif