Update jGL, System uses and update queue. (#196)

* Update jGL, System uses and update queue.

jGL now observes data using pointers for Sprite
and Shape.

System updates objects by first adding to add or
remove sets. These state changes can then be handled
with system overrides or the base. Since jGL now observes
data via pointers the data is always automatically updated.

* unpause sbt demo

demo/desktop/softBodyTetris/loop.lua

@@ -37,18 +37,27 @@ end
 
 time = hop.timeMillis()
 
+if deleted == nil then
+    deleted = false
+end
+
 if time-lastTime > 1000*5 then
 
     hop.setColour(objects[1], 1.0,0.0,0.0,1.0)
 
+    if (not deleted) and #objects > 2 then
+        hop.deleteObject(objects[2])
+        deleted = true
+    end
+
     if (hop.kineticEnergy() > 0.1) then
         lastTime = hop.timeMillis()
     else
         mesh = meshes[math.random(#meshes)]
 
         x = 0.5 + math.random()*0.5 -0.25
         y = 1.25
-        
+
         r = math.random(255)
         g = math.random(255)
         b = math.random(255)
@@ -65,7 +74,7 @@ if time-lastTime > 1000*5 then
             ["mass"] = 1.0,
             ["inertia"] = 0.01,
             ["name"] = "current"
-    
+
         }
 
         id = hop.loadObject(o)

demo/desktop/softBodyTetris/main.cpp

@@ -42,7 +42,7 @@ int main(int argc, char ** argv)
         16,
         1,
         &mapSource,
-        &mapBounds  
+        &mapBounds
     );
 
     sRender & rendering = manager.getSystem<sRender>();
@@ -164,7 +164,7 @@ int main(int argc, char ** argv)
             tp0 = high_resolution_clock::now();
 
             collisions.centreOn(world.get()->getMapCenter());
-            
+
             if (!paused)
             {
                 physics.step(&manager, &collisions, world.get());
@@ -175,7 +175,7 @@ int main(int argc, char ** argv)
             tr0 = high_resolution_clock::now();
 
             rendering.setProjection(camera.getVP());
-            rendering.draw(jGLInstance, &manager, world.get()); 
+            rendering.draw(jGLInstance, &manager, world.get());
 
             tr1 = high_resolution_clock::now();
 
@@ -212,7 +212,7 @@ int main(int argc, char ** argv)
                     "Mouse cell (" << fixedLengthNumber(tile.x,4) << ", " << fixedLengthNumber(tile.y,4) << ", " << tile.tileType <<
                     "\n" <<
                     "Camera [world] (" << fixedLengthNumber(cameraX,4) << ", " << fixedLengthNumber(cameraY,4) << ")" <<
-                    "\n" << 
+                    "\n" <<
                     "update time: " << fixedLengthNumber(pdt+rdt,6) <<
                     "\n" <<
                     "Phys update / draw time: " << fixedLengthNumber(pdt,6) << "/" << fixedLengthNumber(rdt,6) <<
@@ -245,7 +245,7 @@ int main(int argc, char ** argv)
 
         deltas[frameId] = duration_cast<duration<double>>(t1 - t0).count();
         frameId = (frameId+1) % 60;
-        
+
     }
 
     jGLInstance->finish();

demo/desktop/softBodyTetris/main.h

@@ -45,7 +45,7 @@ uint8_t frameId = 0;
 double deltas[60];
 
 bool debug = true;
-bool paused = true;
+bool paused = false;
 
 const double deltaPhysics = 1.0/900.0;
 

include/Component/cRenderable.h

@@ -8,13 +8,7 @@ namespace Hop::Object::Component
 
   struct cRenderable
   {
-      // offset in transform
-
-      // colour
-      float r;
-      float g;
-      float b;
-      float a;
+      glm::vec4 colour;
 
       // atlas coord
       float ux;
@@ -36,7 +30,7 @@ namespace Hop::Object::Component
       bool stale;
 
       cRenderable(std::string shader)
-      : r(1.0),g(0.0),b(0.0),a(1.0),
+      : colour(0,0,0,1),
         ux(0.0),uy(0.0),vx(0.0),vy(0.0),
         uA(0.0f),uB(0.0f),uC(0.0f),uD(0.0f),
         priority(0),
@@ -45,7 +39,7 @@ namespace Hop::Object::Component
 
       cRenderable(
       )
-      : r(1.0),g(0.0),b(0.0),a(1.0),
+      : colour(0,0,0,1),
         ux(0.0),uy(0.0),vx(0.0),vy(0.0),
         uA(0.0f),uB(0.0f),uC(0.0f),uD(0.0f),
         priority(0),
@@ -58,7 +52,7 @@ namespace Hop::Object::Component
         float ua, float ub, float uc, float ud,
         uint64_t p = 0
       )
-      : r(r),g(g),b(b),a(a),
+      : colour(r, g, b, a),
         ux(0.0),uy(0.0),vx(0.0),vy(0.0),
         uA(ua),uB(ub),uC(uc),uD(ud),
         priority(p),
@@ -69,7 +63,7 @@ namespace Hop::Object::Component
         float r, float g, float b, float a,
         uint64_t p = 0
       )
-      : r(r),g(g),b(b),a(a),
+      : colour(r, g, b, a),
         ux(0.0),uy(0.0),vx(0.0),vy(0.0),
         uA(0.0f),uB(0.0f),uC(0.0f),uD(0.0f),
         priority(p),

include/Component/cSprite.h

@@ -15,7 +15,7 @@ namespace Hop::Object::Component
     {
 
         cSprite()
-        : texturePath(""), tx(0), ty(0), lx(0), ly(0)
+        : texturePath(""), textureRegion()
         {}
 
         cSprite
@@ -26,14 +26,11 @@ namespace Hop::Object::Component
             uint16_t lx,
             uint16_t ly
         )
-        : texturePath(path), tx(tx), ty(ty), lx(lx), ly(ly)
+        : texturePath(path), textureRegion(tx, ty, lx, ly)
         {}
 
         std::string texturePath;
-        uint16_t tx;
-        uint16_t ty;
-        uint16_t lx;
-        uint16_t ly;
+        jGL::TextureRegion textureRegion;
     };
 }
 #endif /* CSPRITE_H */

include/Debug/collisionMeshDebug.h

@@ -64,7 +64,7 @@ namespace Hop::Debugging
 
         std::shared_ptr<jGL::Shader> circleShader, rectangleShader;
 
-        std::map<std::string, cTransform> circlePos;
+        std::vector<cTransform> circlePos;
 
     };
 

include/System/Physics/sCollision.h

@@ -27,7 +27,7 @@ namespace Hop::System::Physics
         System to detect collisions and apply forces
     */
 
-    class sCollision : public System 
+    class sCollision : public System
     {
 
     public:
@@ -36,7 +36,7 @@ namespace Hop::System::Physics
 
         void update
         (
-            EntityComponentSystem * m, 
+            EntityComponentSystem * m,
             AbstractWorld * w,
             ThreadPool * workers = nullptr
         );
@@ -62,9 +62,9 @@ namespace Hop::System::Physics
         void setSurfaceFriction(double f) { resolver->setSurfaceFriction(f); }
 
         int lua_setCOR(lua_State * lua)
-        {  
+        {
             int n = lua_gettop(lua);
-            
+
             if (n != 1)
             {
                 lua_pushliteral(lua, "requires 1 argument, cor");
@@ -84,9 +84,9 @@ namespace Hop::System::Physics
         }
 
         int lua_setFriction(lua_State * lua)
-        {  
+        {
             int n = lua_gettop(lua);
-            
+
             if (n != 1)
             {
                 lua_pushliteral(lua, "requires 1 argument, friction");
@@ -109,7 +109,7 @@ namespace Hop::System::Physics
 
         std::unique_ptr<CollisionDetector> detector;
         std::unique_ptr<CollisionResolver> resolver;
-        
+
     };
 
 }

include/System/Physics/sPhysics.h

@@ -31,13 +31,13 @@ namespace Hop::System::Physics
     /*
         System to update cPhysics components given forces
     */
-    class sPhysics : public System 
+    class sPhysics : public System
     {
-        
+
     public:
 
         sPhysics()
-        : dt(1.0/900.0), 
+        : dt(1.0/900.0),
           dtdt(dt*dt),
           gravity(9.81),
           ngx(0.0),
@@ -47,7 +47,7 @@ namespace Hop::System::Physics
 
         void step
         (
-            EntityComponentSystem * m, 
+            EntityComponentSystem * m,
             sCollision * collisions,
             AbstractWorld * world
         );
@@ -63,7 +63,7 @@ namespace Hop::System::Physics
             ngx = nx;
             ngy = ny;
         }
-        
+
         void applyForce(
             EntityComponentSystem * m,
             Id & i,
@@ -88,11 +88,11 @@ namespace Hop::System::Physics
         // automatically compute stable simulation parameters
         // updating all objects
         void stabaliseObjectParameters(Hop::Object::EntityComponentSystem * m);
-        
+
         int lua_setTimeStep(lua_State * lua)
-        {   
+        {
             int n = lua_gettop(lua);
-            
+
             if (n != 1)
             {
                 lua_pushliteral(lua, "requires 1 argument, delta");
@@ -112,9 +112,9 @@ namespace Hop::System::Physics
         }
 
         int lua_setSubSamples(lua_State * lua)
-        {   
+        {
             int n = lua_gettop(lua);
-            
+
             if (n != 1)
             {
                 lua_pushliteral(lua, "requires 1 argument, subsamples");
@@ -143,7 +143,7 @@ namespace Hop::System::Physics
             lua_pushnumber(lua, energy);
             return 1;
         }
-        
+
         void setTimeStep(double delta){dt = delta; dtdt = dt*dt;}
         double getTimeStep() const { return dt; }
 
@@ -154,10 +154,10 @@ namespace Hop::System::Physics
         double getGravity() const { return gravity; }
         glm::vec2 getGravityDirection() const { return glm::vec2(ngx, ngy); }
 
-        // Lua 
+        // Lua
 
         int lua_setGravity(lua_State * lua);
-        
+
     private:
 
         void update(EntityComponentSystem * m, ThreadPool * workers = nullptr);

include/System/Rendering/sRender.h

@@ -112,6 +112,8 @@ namespace Hop::System::Rendering
         std::shared_ptr<jGL::SpriteRenderer> sprites = nullptr;
         std::unique_ptr<CollisionMeshDebug> collisionMeshDebug = nullptr;
         std::shared_ptr<TextureAssetStore> textures = nullptr;
+
+        void updateObjects();
     };
 }
 

include/System/Sound/sSound.h

@@ -1,7 +1,7 @@
 #ifndef SSOUND_H
 #define SSOUND_H
 
-#define MA_NO_VORBIS 
+#define MA_NO_VORBIS
 #define MINIAUDIO_IMPLEMENTATION
 #include <miniaudio/miniaudio.h>
 #include <System/Sound/vorbis.h>
@@ -20,14 +20,14 @@ namespace Hop::System::Sound
 {
 
     void data_callback(ma_device* pDevice, void* pOutput, const void* pInput, ma_uint32 frameCount);
-   
+
     std::string to_string(ma_result code);
 
     enum class DECODER {MA, VORBIS, NONE};
 
     class sSound : public System
     {
-    
+
     public:
 
         sSound()
@@ -54,7 +54,7 @@ namespace Hop::System::Sound
             if (result != MA_SUCCESS)
             {
                 vorbisConfig = ma_decoder_config_init_default();
-                vorbisConfig.pCustomBackendUserData = NULL; 
+                vorbisConfig.pCustomBackendUserData = NULL;
                 vorbisConfig.ppCustomBackendVTables = pCustomBackendVTables;
                 vorbisConfig.customBackendCount     = sizeof(pCustomBackendVTables) / sizeof(pCustomBackendVTables[0]);
 
@@ -78,7 +78,7 @@ namespace Hop::System::Sound
             if (loopingFile == "")
             {
                 loopingFile = filename;
-                
+
                 ma_result result = decode(filename);
 
                 if (result != MA_SUCCESS)
@@ -94,7 +94,7 @@ namespace Hop::System::Sound
                     ma_data_source_set_looping(&decoder, MA_TRUE);
 
                     config = ma_device_config_init(ma_device_type_playback);
-                    
+
                     config.playback.format = decoder.outputFormat;
                     config.playback.channels = decoder.outputChannels;
                     config.sampleRate = decoder.outputSampleRate;
@@ -106,7 +106,7 @@ namespace Hop::System::Sound
                     ma_data_source_set_looping(&vorbisDecoder, MA_TRUE);
 
                     config = ma_device_config_init(ma_device_type_playback);
-                    
+
                     config.playback.format = vorbisDecoder.outputFormat;
                     config.playback.channels = vorbisDecoder.outputChannels;
                     config.sampleRate = vorbisDecoder.outputSampleRate;