Update engine

upf-gti · Dec 10, 2024 · ba18b7f · ba18b7f
1 parent 515bdf9
commit ba18b7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/libraries/wgpuEngine b/libraries/wgpuEngine
diff --git a/src/engine/sample_engine.cpp b/src/engine/sample_engine.cpp
@@ -8,6 +8,7 @@
 #include "framework/nodes/omni_light_3d.h"
 #include "framework/nodes/directional_light_3d.h"
 #include "framework/parsers/parse_scene.h"
+#include "framework/parsers/parse_gltf.h"
 #include "framework/camera/camera.h"
 #include "framework/camera/camera_3d.h"
 #include "framework/input.h"
@@ -34,6 +35,8 @@
 
 sVPETContext vpet;
 
+GltfParser gltf_parser;
+
 int SampleEngine::initialize(Renderer* renderer, sEngineConfiguration configuration)
 {
     int error = Engine::initialize(renderer, configuration);
@@ -1100,7 +1103,9 @@ void SampleEngine::append_glb(const std::string& filename)
 {
     std::vector<Node*> entities;
 
-    parse_scene(filename.c_str(), entities, true, scene_root);
+    gltf_parser.push_scene_root(scene_root);
+
+    gltf_parser.parse(filename.c_str(), entities, PARSE_NO_FLAGS);
 
     if (!entities.empty()) {
         assert(!scene_root);
+14 −0		src/framework/camera/camera.cpp
+11 −10		src/framework/camera/camera.h
+46 −25		src/framework/parsers/parse_gltf.cpp
+53 −3		src/framework/parsers/parse_gltf.h
+2 −2		src/framework/parsers/parse_ply.cpp
+5 −3		src/framework/parsers/parse_ply.h
+19 −5		src/framework/parsers/parse_scene.cpp
+2 −2		src/framework/parsers/parse_vdb.cpp
+5 −3		src/framework/parsers/parse_vdb.h
+19 −0		src/framework/parsers/parser.h
+7 −0		src/framework/utils/hash.h