Merge pull request #36 from assimp/update/update_deps

Update/update deps

Author: kimkulling

.github/workflows/cmake-multi-platform.yml

@@ -51,7 +51,7 @@ jobs:
       run: |
         sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
         sudo apt-get update -y -qq
-        sudo apt-get install libsdl2-dev libglm-dev libglew-dev
+        sudo apt-get install libsdl2-dev libglm-dev libglew-dev libgtest-dev googletest
 
     - name: Set reusable strings
       # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.

.github/workflows/cmake.yml

@@ -26,7 +26,7 @@ jobs:
       run: |
         sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
         sudo apt-get update -y -qq
-        sudo apt-get install libsdl2-dev libglm-dev libglew-dev
+        sudo apt-get install libsdl2-dev libglm-dev libglew-dev libgtest-dev googletest
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

contrib/assimp

@@ -34,6 +34,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <assimp/scene.h>
 #include <assimp/Exporter.hpp>
 
+#include <iostream>
+
 using namespace ::OSRE;
 using namespace ::OSRE::App;
 using namespace ::OSRE::Common;
@@ -103,7 +105,7 @@ void ModelLoadingApp::showStatistics(const aiScene &scene) {
 }
 
 void ModelLoadingApp::importAsset(const IO::Uri &modelLoc) {
-    mAssimpWrapper = new AssimpWrapper(*getIdContainer(), getStage()->getActiveWorld(0));
+    mAssimpWrapper = new AssimpWrapper(*getIdContainer(), getActiveScene());
     if (!mAssimpWrapper->importAsset(modelLoc, 0)) {
         return;
     }
@@ -119,14 +121,14 @@ void ModelLoadingApp::importAsset(const IO::Uri &modelLoc) {
 
     Rect2ui windowsRect;
     rootWindow->getWindowsRect(windowsRect);
-    World *world = getStage()->addActiveWorld("model");
+    Scene *scene = getActiveScene();
     Entity *entity = mAssimpWrapper->getEntity();
-    Entity *camEntity = new Entity("camera", *getIdContainer(), world);
+    Entity *camEntity = new Entity("camera", *getIdContainer(), scene);
     mCamera = (CameraComponent*)camEntity->createComponent(ComponentType::CameraComponentType);
     mCamera->setProjectionParameters(60.f, (f32)windowsRect.width, (f32)windowsRect.height, 0.01f, 1000.f);
-    world->setActiveCamera(mCamera);
+    scene->setActiveCamera(mCamera);
 
-    world->addEntity(entity);
+    scene->addEntity(entity);
     mCamera->observeBoundingBox(entity->getAABB());
     mModelNode = entity->getNode();
 

contrib/osre

@@ -32,6 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "Properties/Settings.h"
 #include "RenderBackend/RenderBackendService.h"
 #include "RenderBackend/RenderCommon.h"
+#include "RenderBackend/TransformMatrixBlock.h"
 
 using namespace ::OSRE;
 using namespace ::OSRE::App;

src/ModelLoading.cpp

@@ -7,7 +7,7 @@ using namespace ::OSRE::RenderBackend;
 
 int main(int argc, char *argv[]) {
     ModelLoadingApp myApp(argc, argv);
-    if (!myApp.initWindow(10, 10, 1024, 768, "Assimp-Vewer! Press i to import, e to export", false, false, App::RenderBackendType::OpenGLRenderBackend)) {
+    if (!myApp.initWindow(10, 10, 1024, 768, "Assimp-Vewer! Press i to import, e to export", WindowMode::Windowed, WindowType::Root, App::RenderBackendType::OpenGLRenderBackend)) {
         return 1;
     }
 

src/ModelLoadingApp.h

@@ -2,6 +2,7 @@
   "dependencies": [
     "glm",
     "sdl2",
-    "glew"
+    "glew",
+    "gtest"
   ]
 }