Update deps (#185)

* Update jGL/jLog
JerboaBurrow · Jul 28, 2024 · 3b11009 · 3b11009
1 parent 8f52ef0
commit 3b11009
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 32 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -169,7 +169,7 @@ jobs:
         path: demos.zip
 
   macosNative:
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v4
@@ -284,10 +284,11 @@ jobs:
         mkdir cmdline-tools
         mv latest cmdline-tools
         yes | ./cmdline-tools/latest/bin/sdkmanager --licenses
-        ./cmdline-tools/latest/bin/sdkmanager --install "system-images;android-33;google_apis;x86_64"
-        ./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-33"
-        echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android33 --package "system-images;android-33;google_apis;x86_64"
-
+        ./cmdline-tools/latest/bin/sdkmanager --channel=3 emulator
+        ./cmdline-tools/latest/bin/sdkmanager --install "system-images;android-34;google_apis;x86_64"
+        ./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-34"
+        echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android34 --package "system-images;android-34;google_apis;x86_64"
+    
     - name: build hop
       run: |
         git submodule update --recursive
@@ -418,7 +419,7 @@ jobs:
 
   test-release-macos:
     needs: [macosNative, headers]
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -146,7 +146,11 @@ if(BENCHMARK)
     target_compile_definitions(Hop PUBLIC BENCHMARK)
 endif()
 
-target_link_libraries(Hop PUBLIC jGL ${GLEW_LIBRARIES} zlibstatic stduuid Lua Miniaudio)
+if (WINDOWS)
+    target_link_libraries(Hop PUBLIC jGL ${GLEW_LIBRARIES} zlibstatic stduuid Lua Miniaudio "winmm")
+else()
+    target_link_libraries(Hop PUBLIC jGL ${GLEW_LIBRARIES} zlibstatic stduuid Lua Miniaudio)
+endif()
 
 if (NOT ANDROID)
     add_subdirectory(tools/)

diff --git a/include/Component/cTransform.h b/include/Component/cTransform.h
@@ -1,22 +1,11 @@
 #ifndef CTRANSFORM_H
 #define CTRANSFORM_H
 
+#include <jGL/primitive.h>
+
 namespace Hop::Object::Component
 {
-    struct cTransform {
-        double x, y, scale, theta;
-
-        cTransform() = default;
-
-        cTransform(
-            double x,
-            double y,
-            double t,
-            double s
-        )
-        : x(x), y(y), scale(s), theta(t)
-        {}
-    };
+    using cTransform = jGL::Transform;
 }
 
 #endif /* CTRANSFORM_H */
diff --git a/include/Console/console.h b/include/Console/console.h
@@ -29,7 +29,7 @@ namespace Hop
 
     using jLog::INFO;
     using jLog::WARN;
-    using jLog::ERROR;
+    using jLog::ERR;
     using jLog::Log;
     using jLog::ERRORCODE;
 
@@ -192,7 +192,7 @@ namespace Hop
             {
                 std::string msg = "Exited with error running "+lastCommandOrProgram+"\n";
                 msg += stackTrace;
-                ERROR(ERRORCODE::LUA_ERROR, msg) >> log;
+                ERR(ERRORCODE::LUA_ERROR, msg) >> log;
                 return true;
             }
             else

diff --git a/include/System/Sound/sSound.h b/include/System/Sound/sSound.h
@@ -86,7 +86,7 @@ namespace Hop::System::Sound
                     jLog::Log log;
                     std::stringstream ss;
                     ss << "Could not decode audio file: " << filename << ", got error: " << to_string(result);
-                    jLog::ERROR(ss.str()) >> log;
+                    jLog::ERR(ss.str()) >> log;
                 }
 
                 if (decoderInUse == DECODER::MA)

diff --git a/include/jGL b/include/jGL
diff --git a/include/jLog b/include/jLog
diff --git a/src/Debug/collisionMeshDebug.cpp b/src/Debug/collisionMeshDebug.cpp
@@ -95,11 +95,8 @@ namespace Hop::Debugging
                 // }
 
                 std::string sid = to_string(citer->first)+"-"+std::to_string(i);
-                shapes->getShape(sid)->update
-                (
-                    jGL::Transform(cp->x, cp->y, theta, scale*2.0*cpmodel->r),
-                    glm::vec4(ren.r, ren.g, ren.b, ren.a)
-                );
+                shapes->getShape(sid)->transform = jGL::Transform(cp->x, cp->y, theta, scale*2.0*cpmodel->r);
+                shapes->getShape(sid)->colour = glm::vec4(ren.r, ren.g, ren.b, ren.a);
 
             }
 

diff --git a/tests/regression/user-mingw/CMakeLists.txt b/tests/regression/user-mingw/CMakeLists.txt
@@ -29,8 +29,9 @@ target_link_libraries(
 	${X11_LIBRARIES}
 	${OPENGL_LIBRARIES} 
     ${Vulkan_LIBRARIES}
-    	${ZLIB_LIBRARIES}
+    ${ZLIB_LIBRARIES}
     ${CMAKE_SOURCE_DIR}/libHop.a
+	"winmm"
 )
 
 target_include_directories(
+1 −1		.github/workflows/build-tests.yml
+2 −2		.github/workflows/release.yml
+14 −2		CMakeLists.txt
+8 −4		examples/Shape/main.cpp
+20 −9		examples/Sprite/main.cpp
+11 −0		include/jGL/Display/desktopDisplay.h
+10 −12		include/jGL/Display/display.h
+7 −6		include/jGL/OpenGL/glSpriteRenderer.h
+5 −5		include/jGL/primitive.h
+0 −10		include/jGL/shape.h
+2 −2		include/jGL/shapeRenderer.h
+20 −22		include/jGL/sprite.h
+2 −2		include/jGL/spriteRenderer.h
+1 −1		include/jLog
+4 −4		src/jGL/OpenGL/glShapeRenderer.cpp
+24 −20		src/jGL/OpenGL/glSpriteRenderer.cpp
+4 −4		src/jGL/spriteRenderer.cpp
+1 −1		tests/regression/user-macos/main.cpp
+1 −0		tests/regression/user-mingw/CMakeLists.txt
+1 −1		tests/regression/user-mingw/main.cpp
+1 −1		tests/regression/user/main.cpp