Update jgl to 0-0.0.8 (#189)

* Update jgl to 0-0.0.8

CMakeLists.txt

@@ -25,10 +25,10 @@ if (SYNTAX_ONLY)
 #     find_package(OpenGL REQUIRED)
 #     set(GLEW_INCLUDE include/vendored/glew/include/)
 #     include_directories(
-#         include 
-#         ${OPENGL_INCLUDE_DIRS} 
-#         ${GLEW_INCLUDE} 
-#         include/vendored/freetype/include 
+#         include
+#         ${OPENGL_INCLUDE_DIRS}
+#         ${GLEW_INCLUDE}
+#         include/vendored/freetype/include
 #         include/vendored/glm
 #     )
 #     file(GLOB SRC "src/*.cpp")
@@ -102,7 +102,7 @@ set(${VORBIS_INCLUDE_DIRS} include/vendored/vorbis/include)
 file(GLOB MINIAUDIO_SRC "include/vendored/miniaudio/*.c")
 include_directories(include/vendored/miniaudio ${VORBIS_INCLUDE_DIRS})
 add_library(Miniaudio STATIC ${MINIAUDIO_SRC})
-target_link_libraries(Miniaudio vorbisfile ogg ${CMAKE_DL_LIBS}) 
+target_link_libraries(Miniaudio vorbisfile ogg ${CMAKE_DL_LIBS})
 
 include_directories(include include/vendored include/jGL/include)
 
@@ -114,16 +114,16 @@ include_directories(include/vendored/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib_build
 
 set(${SPARSEHASH_INCLUDE_DIRS} include/vendored/sparsehash)
 
-file(GLOB SRC 
+file(GLOB SRC
     "src/*.cpp"
     "src/Text/*.cpp"
     "src/Object/*.cpp"
     "src/Shader/*.cpp"
     "src/System/*.cpp"
     "src/Component/*.cpp"
     "src/Collision/*.cpp"
-    "src/World/*.cpp" 
-    "src/Maths/*.cpp" 
+    "src/World/*.cpp"
+    "src/Maths/*.cpp"
     "src/Util/*.cpp"
     "src/Debug/*.cpp"
     "src/Console/*.cpp"
@@ -136,12 +136,13 @@ if (NOT ANDROID)
     file(GLOB STANDALONE_SRC "src/Display/*.cpp")
     add_library(Hop STATIC ${SRC} ${STANDALONE_SRC})
     target_compile_definitions(Hop PUBLIC GLSL_VERSION="330")
-
 else()
     add_library(Hop STATIC ${SRC})
     target_compile_definitions(Hop PUBLIC GLSL_VERSION="300 es")
 endif()
 
+target_compile_definitions(Hop PUBLIC MAX_SPRITE_BATCH_BOUND_TEXTURES=4)
+
 if(BENCHMARK)
     target_compile_definitions(Hop PUBLIC BENCHMARK)
 endif()

demo/android/perlinWorld/app/src/main/cpp/CMakeLists.txt

@@ -17,6 +17,7 @@ add_library(
         hopAndroid.cpp)
 
 target_compile_definitions(HopAndroid PUBLIC GLSL_VERSION="300 es")
+target_compile_definitions(HopAndroid PUBLIC MAX_SPRITE_BATCH_BOUND_TEXTURES=4)
 
 include_directories(include)
 include_directories(.)

include/Collision/collisionMesh.h

@@ -51,7 +51,7 @@ namespace Hop::System::Physics
         {}
 
         MeshRectangle
-        (        
+        (
             double llx, double lly,
             double ulx, double uly,
             double urx, double ury,
@@ -73,7 +73,7 @@ namespace Hop::System::Physics
 
         bool operator==(const MeshRectangle & rhs)
         {
-            return llx == rhs.llx && 
+            return llx == rhs.llx &&
                    lly == rhs.lly &&
                    ulx == rhs.ulx &&
                    uly == rhs.uly &&
@@ -86,12 +86,12 @@ namespace Hop::System::Physics
         double llx, lly, ulx, uly, urx, ury, lrx, lry;
     };
 
-    struct CollisionMesh 
+    struct CollisionMesh
     {
         CollisionMesh()
         {}
-        // construct a mesh around a model space polygon 
-        //   with vertices v with each mesh vertex having 
+        // construct a mesh around a model space polygon
+        //   with vertices v with each mesh vertex having
         //   radius r in model space
         //CollisionMesh(std::vector<Vertex> v, double r = 0.01);
 
@@ -100,8 +100,8 @@ namespace Hop::System::Physics
         (
             std::vector<std::shared_ptr<CollisionPrimitive>> v,
             double x,
-            double y, 
-            double theta, 
+            double y,
+            double theta,
             double scale
         )
         : CollisionMesh(std::move(v))
@@ -177,7 +177,7 @@ namespace Hop::System::Physics
             cPhysics phys(t.x,t.y,t.theta);
             updateWorldMesh(t, phys, 0.0);
         }
-        
+
         void add(std::shared_ptr<CollisionPrimitive> c)
         {
 
@@ -245,10 +245,10 @@ namespace Hop::System::Physics
                     (
                         c->x,
                         c->y,
-                        c->r, 
+                        c->r,
                         c->tag,
-                        c->stiffness, 
-                        c->damping, 
+                        c->stiffness,
+                        c->damping,
                         c->effectiveMass
                     )
                 );
@@ -304,7 +304,7 @@ namespace Hop::System::Physics
             return worldVertices[i];
         }
 
-        std::shared_ptr<CollisionPrimitive> operator[](size_t i) 
+        std::shared_ptr<CollisionPrimitive> operator[](size_t i)
         {
             return worldVertices[i];
         }
@@ -320,7 +320,7 @@ namespace Hop::System::Physics
             {
                 return updateWorldMeshRigid(transform, dt);
             }
-            else 
+            else
             {
                 return updateWorldMeshSoft(transform, physics, dt);
             }
@@ -337,7 +337,7 @@ namespace Hop::System::Physics
             double dt
         );
 
-        double bestAngle(double x, double y, double scale);
+        double bestAngle(double x, double y, double scaleX, double scaleY);
         void centerOfMassWorld(double & cx, double & cy);
         void modelToCenterOfMassFrame();
 
@@ -347,7 +347,7 @@ namespace Hop::System::Physics
 
         bool getIsRigid(){ return isRigid; }
 
-        void calculateIsRigid() 
+        void calculateIsRigid()
         {
             for (auto v : worldVertices)
             {
@@ -367,7 +367,7 @@ namespace Hop::System::Physics
                 gx += fx;
                 gy += fy;
             }
-            else 
+            else
             {
                 for (auto w : worldVertices)
                 {
@@ -379,7 +379,7 @@ namespace Hop::System::Physics
 
         double getEffectiveMass() const { return totalEffectiveMass; }
 
-        void calculateTotalEffectiveMass() 
+        void calculateTotalEffectiveMass()
         {
             totalEffectiveMass = 0.0;
             for (auto v : worldVertices)
@@ -397,7 +397,7 @@ namespace Hop::System::Physics
         {
             return kineticEnergy;
         }
-        
+
         bool areSomeRectangles() const { return someRectangles; }
 
         void updateTags()
@@ -483,8 +483,8 @@ namespace Hop::System::Physics
             std::vector<Vertex> v(c.size());
             std::transform
             (
-                c.begin(), 
-                c.end(), 
+                c.begin(),
+                c.end(),
                 v.begin(),
                 [](std::shared_ptr<CollisionPrimitive> c)
                 {
@@ -498,7 +498,7 @@ namespace Hop::System::Physics
             {
                 r = std::max(r, c->r);
             }
-            
+
             return Hop::Maths::boundingBox(v, r);
         }
 
@@ -509,7 +509,7 @@ namespace Hop::System::Physics
         }
 
         std::set<uint64_t> getTags() const { return tags; }
-        
+
     private:
 
         std::vector<std::shared_ptr<MeshPoint>> vertices;

include/Debug/collisionMeshDebug.h

@@ -10,6 +10,7 @@
 
 #include <jGL/jGL.h>
 #include <jLog/jLog.h>
+#include <jGL/OpenGL/glShapeRenderer.h>
 
 namespace Hop::Object
 {
@@ -35,14 +36,14 @@ namespace Hop::Debugging
           shapes(jgl->createShapeRenderer(256)),
           circleShader(std::make_shared<jGL::GL::glShader>
            (
-              Hop::System::Rendering::collisionPrimitiveVertexShader, 
+              jGL::GL::glShapeRenderer::shapeVertexShader,
               Hop::System::Rendering::collisionPrimitiveFragmentShader
            )
           ),
           rectangleShader(std::make_shared<jGL::GL::glShader>
             (
-                Hop::System::Rendering::rectangleVertexShader, 
-                Hop::System::Rendering::rectangleFragmentShader
+                jGL::GL::glShapeRenderer::shapeVertexShader,
+                jGL::GL::glShapeRenderer::rectangleFragmentShader
             )
           )
         {}
@@ -63,6 +64,8 @@ namespace Hop::Debugging
 
         std::shared_ptr<jGL::Shader> circleShader, rectangleShader;
 
+        std::map<std::string, cTransform> circlePos;
+
     };
 
 }

include/Shader/meshDebug.shader

@@ -3,26 +3,11 @@
 
 namespace Hop::System::Rendering
 {
-    static const char * collisionPrimitiveVertexShader = "#version " GLSL_VERSION "\n"
-        "precision lowp float;\n precision lowp int;\n"
-        "layout(location=0) in vec4 a_position;\n"
-        "layout(location=1) in vec4 a_offset;\n"
-        "layout(location=2) in vec4 a_colour;\n"
-        "uniform mat4 proj;\n"
-        "out vec2 texCoord;\n"
-        "out vec4 oColour;\n"
-        "void main()\n"
-        "{\n"
-            "gl_Position = proj*vec4(a_offset.w*a_position.xy+a_offset.xy,0.0,1.0);\n"
-            "texCoord = a_position.zw;\n"
-            "oColour = a_colour;\n"
-        "}";
-
     static const char * collisionPrimitiveFragmentShader = "#version " GLSL_VERSION "\n"
         "precision lowp float;\n precision lowp int;\n"
-        "in vec4 oColour;\n"
         "in vec2 texCoord;\n"
-        "out vec4 colour;\n"
+        "in vec4 colour;\n"
+        "layout(location=0) out vec4 fragment;\n"
         "float t0 = 0.12;\n"
         "float t1 = 0.2025;\n"
         "float t2 = 0.25;\n"
@@ -33,10 +18,10 @@ namespace Hop::System::Rendering
         "   if (d2 > t2) {discard;}\n"
         "   float alpha = 1.0-smoothstep(t1, t2, d2);"
         "   float mixer = 1.0-smoothstep(t0, t1, d2);"
-        "   colour = vec4( mix(vec3(0.0,0.0,0.0),oColour.rgb, mixer), alpha*oColour.a );"
+        "   fragment = vec4( mix(vec3(0.0,0.0,0.0),colour.rgb, mixer), alpha*colour.a );"
         "}";
 
-    static const char * rectangleVertexShader = "#version " GLSL_VERSION "\n"
+    static const char * rectangleVertexShader __attribute__((unused)) = "#version " GLSL_VERSION "\n"
         "precision lowp float;\n precision lowp int;\n"
         "layout(location=0) in vec4 a_position;\n"
         "layout(location=1) in vec4 a_offset;\n"
@@ -60,7 +45,7 @@ namespace Hop::System::Rendering
             "th = a_thickness;\n"
         "}";
 
-    static const char * rectangleFragmentShader = "#version " GLSL_VERSION "\n"
+    static const char * rectangleFragmentShader __attribute__((unused)) = "#version " GLSL_VERSION "\n"
         "precision lowp float;\n precision lowp int;\n"
         "in vec4 oColour;\n"
         "in vec2 texCoord;\n"