more refactoring

thermion_dart/native/include/RenderTicker.hpp

@@ -1,25 +1,31 @@
 #pragma once
 
-#include <filament/Engine.h>
-#include <filament/Renderer.h>
-#include <filament/View.h>
-
-#include <math/vec3.h>
-#include <math/vec4.h>
-#include <math/mat3.h>
-#include <math/norm.h>
-
-#include <fstream>
-#include <iostream>
-#include <string>
 #include <chrono>
+#include <mutex>
+#include <vector>
+#include <map>
 
-#include "scene/SceneManager.hpp"
+#include <filament/Renderer.h>
+#include <filament/SwapChain.h>
+#include <filament/View.h>
+#include <filament/Viewport.h>
+
+#include <filament/Camera.h>
+#include <filament/Engine.h>
+#include <filament/IndexBuffer.h>
+#include <filament/Material.h>
+#include <filament/MaterialInstance.h>
+#include <filament/RenderableManager.h>
+#include <filament/Scene.h>
+#include <filament/TransformManager.h>
+#include <filament/VertexBuffer.h>
+
+#include "scene/AnimationManager.hpp"
 
 namespace thermion
 {
 
-    typedef std::chrono::time_point<std::chrono::high_resolution_clock> time_point_t;
+    typedef std::chrono::time_point time_point_t;
 
     using namespace std::chrono;
 
@@ -27,22 +33,26 @@ namespace thermion
     {
 
     public:
-        RenderTicker(filament::Renderer renderer, thermion::SceneManager sceneManager) : mRenderer(renderer), mSceneManager(sceneManager) { }
+        RenderTicker(filament::Renderer *renderer) : mRenderer(renderer) { }
         ~RenderTicker();
         
         void render(
             uint64_t frameTimeInNanos
         );
-        void setRenderable(SwapChain *swapChain, View **view, uint8_t numViews);
+        void setRenderable(filament::SwapChain *swapChain, filament::View **view, uint8_t numViews);
+
+        void addAnimationManager(AnimationManager* animationManager);
+        void removeAnimationManager(AnimationManager* animationManager);
+
 
     private:
         std::mutex mMutex;
-        Renderer *mRenderer = nullptr;
-        SceneManager *mSceneManager = nullptr;
-        std::vector<SwapChain*> mSwapChains;
-        std::map<SwapChain*, std::vector<View*>> mRenderable;
+        filament::Renderer *mRenderer = nullptr;
+        std::vector<AnimationManager*> mAnimationManagers;
+        std::vector<filament::SwapChain*> mSwapChains;
+        std::map<filament::SwapChain*, std::vector<filament::View*>> mRenderable;
 
     };
 
 
-}
+}

thermion_dart/native/include/c_api/TAnimationManager.h

@@ -8,6 +8,8 @@ extern "C"
 {
 #endif
 
+	EMSCRIPTEN_KEEPALIVE TAnimationManager *AnimationManager_create(TEngine *tEngine);
+
 	EMSCRIPTEN_KEEPALIVE void AnimationManager_addAnimationComponent(TAnimationManager *tAnimationManager, EntityId entityId);
 
 	EMSCRIPTEN_KEEPALIVE void AnimationManager_removeAnimationComponent(TAnimationManager *tAnimationManager, EntityId entityId);

thermion_dart/native/include/c_api/TEngine.h

@@ -43,6 +43,7 @@ EMSCRIPTEN_KEEPALIVE void Engine_flushAndWait(TEngine *tEngine);
     
 EMSCRIPTEN_KEEPALIVE TMaterial *Engine_buildMaterial(TEngine *tEngine, const uint8_t* materialData, size_t length);
 EMSCRIPTEN_KEEPALIVE void Engine_destroyMaterial(TEngine *tEngine, TMaterial *tMaterial);
+EMSCRIPTEN_KEEPALIVE void Engine_destroyMaterialInstance(TEngine *tEngine, TMaterialInstance *tMaterialInstance);
 EMSCRIPTEN_KEEPALIVE TScene *Engine_createScene(TEngine *tEngine);
 EMSCRIPTEN_KEEPALIVE TSkybox *Engine_buildSkybox(TEngine *tEngine, uint8_t* ktxData, size_t length, void(*onTextureUploadComplete)());
 EMSCRIPTEN_KEEPALIVE TIndirectLight *Engine_buildIndirectLight(TEngine *tEngine, uint8_t* ktxData, size_t length, float intensity, void(*onTextureUploadComplete)());

thermion_dart/native/include/c_api/TIndirectLight.h

@@ -12,7 +12,7 @@ extern "C"
 {
 #endif
 
-EMSCRIPTEN_KEEPALIVE void IndirectLight_setRotation(TIndirectLight TIndirectLight, double3x3 rotation);
+EMSCRIPTEN_KEEPALIVE void IndirectLight_setRotation(TIndirectLight *tIndirectLight, double *rotation);
 
 #ifdef __cplusplus
 }

thermion_dart/native/include/c_api/TLightManager.h

@@ -9,11 +9,19 @@ extern "C"
 {
 #endif
 
+	enum TLightType {
+		LIGHT_TYPE_SUN,
+		LIGHT_TYPE_DIRECTIONAL,
+		LIGHT_TYPE_POINT,
+		LIGHT_TYPE_FOCUSED_SPOT,
+		LIGHT_TYPE_SPOT
+	};
+
 	EMSCRIPTEN_KEEPALIVE void LightManager_setPosition(TLightManager *tLightManager, EntityId light, double x, double y, double z);
 	EMSCRIPTEN_KEEPALIVE void LightManager_setDirection(TLightManager *tLightManager, EntityId light, double x, double y, double z);
-	EMSCRIPTEN_KEEPALIVE int LightManager_createLight(TLightManager *tLightManager, EntityId entity, int type);
+	EMSCRIPTEN_KEEPALIVE int LightManager_createLight(TLightManager *tLightManager, TLightType tLightTtype);
 	EMSCRIPTEN_KEEPALIVE void LightManager_destroyLight(TLightManager *tLightManager, EntityId entity);
-	EMSCRIPTEN_KEEPALIVE void LightManager_setColor(TLightManager *tLightManager, EntityId entity, double r, double g, double b);
+	EMSCRIPTEN_KEEPALIVE void LightManager_setColor(TLightManager *tLightManager, EntityId entity, float colorTemperature);
 	EMSCRIPTEN_KEEPALIVE void LightManager_setIntensity(TLightManager *tLightManager, EntityId entity, double intensity);
 	EMSCRIPTEN_KEEPALIVE void LightManager_setFalloff(TLightManager *tLightManager, EntityId entity, double falloff);
 	EMSCRIPTEN_KEEPALIVE void LightManager_setSpotLightCone(TLightManager *tLightManager, EntityId entity, double inner, double outer);

thermion_dart/native/include/c_api/TNameComponentManager.h

@@ -7,7 +7,7 @@
 extern "C"
 {
 #endif
-
+	EMSCRIPTEN_KEEPALIVE TNameComponentManager *NameComponentManager_create();
 	EMSCRIPTEN_KEEPALIVE const char *NameComponentManager_getName(TNameComponentManager *tNameComponentManager, EntityId entity);
 	
 

thermion_dart/native/include/c_api/TRenderTicker.h

@@ -8,7 +8,10 @@ extern "C"
 {
 #endif
 
-	EMSCRIPTEN_KEEPALIVE TRenderTicker *RenderTicker_create(TRenderer *tRenderer, TSceneManager *tSceneManager);
+	EMSCRIPTEN_KEEPALIVE TRenderTicker *RenderTicker_create(TRenderer *tRenderer);
+	EMSCRIPTEN_KEEPALIVE void RenderTicker_addAnimationManager(TRenderTicker *tRenderTicker, TAnimationManager *tAnimationManager);
+	EMSCRIPTEN_KEEPALIVE void RenderTicker_removeAnimationManager(TRenderTicker *tRenderTicker, TAnimationManager *tAnimationManager);
+	
 	EMSCRIPTEN_KEEPALIVE void RenderTicker_render(TRenderTicker *tRenderTicker, uint64_t frameTimeInNanos);
 	EMSCRIPTEN_KEEPALIVE void RenderTicker_setRenderable(TRenderTicker *tFilamentRender, TSwapChain *swapChain, TView **views, uint8_t numViews);	
 	

thermion_dart/native/include/c_api/TRenderableManager.h

@@ -20,6 +20,7 @@ extern "C"
     EMSCRIPTEN_KEEPALIVE void RenderableManager_setReceiveShadows(TRenderableManager *tRenderableManager, EntityId entityId, bool receiveShadows);
     EMSCRIPTEN_KEEPALIVE bool RenderableManager_isShadowReceiver(TRenderableManager *tRenderableManager, EntityId entityId);
     EMSCRIPTEN_KEEPALIVE bool RenderableManager_getFogEnabled(TRenderableManager *tRenderableManager, EntityId entityId);
+    EMSCRIPTEN_KEEPALIVE Aabb3 RenderableManager_getAabb(TRenderableManager *tRenderableManager, EntityId entityId);
 
 #ifdef __cplusplus
 }

thermion_dart/native/include/c_api/TScene.h

@@ -16,6 +16,7 @@ extern "C"
 
 
 EMSCRIPTEN_KEEPALIVE void Scene_addEntity(TScene* tScene, EntityId entityId);
+EMSCRIPTEN_KEEPALIVE void Scene_removeEntity(TScene* tScene, EntityId entityId);
 EMSCRIPTEN_KEEPALIVE void Scene_setSkybox(TScene* tScene, TSkybox *skybox);
 EMSCRIPTEN_KEEPALIVE void Scene_setIndirectLight(TScene* tScene, TIndirectLight *tIndirectLight);
 EMSCRIPTEN_KEEPALIVE void Scene_addFilamentAsset(TScene* tScene, TFilamentAsset *asset);

thermion_dart/native/include/c_api/TSceneAsset.h

@@ -24,7 +24,29 @@ extern "C"
         TMaterialInstance **materialInstances,
 		int materialInstanceCount
     );
+    
+    EMSCRIPTEN_KEEPALIVE TSceneAsset *SceneAsset_loadGlb(
+        TGltfAssetLoader *tAssetLoader,
+        TGltfResourceLoader *tResourceLoader,
+        TEngine *tEngine,
+        TNameComponentManager *tNameComponentManager,
+        uint8_t *data,
+        size_t length,
+        size_t numInstances
+    );
+
+    EMSCRIPTEN_KEEPALIVE TSceneAsset *SceneAsset_loadGltf(
+        TGltfAssetLoader *tAssetLoader,
+        TGltfResourceLoader *tResourceLoader,
+        TEngine *tEngine,
+        TNameComponentManager *tNameComponentManager,
+        uint8_t *data,
+        size_t length,
+        size_t numInstances
+    );
+    
     EMSCRIPTEN_KEEPALIVE void SceneAsset_addToScene(TSceneAsset *tSceneAsset, TScene *tScene);
+    EMSCRIPTEN_KEEPALIVE void SceneAsset_removeFromScene(TSceneAsset *tSceneAsset, TScene *tScene);
     EMSCRIPTEN_KEEPALIVE EntityId SceneAsset_getEntity(TSceneAsset *tSceneAsset);
 	EMSCRIPTEN_KEEPALIVE int SceneAsset_getChildEntityCount(TSceneAsset* tSceneAsset);
     EMSCRIPTEN_KEEPALIVE void SceneAsset_getChildEntities(TSceneAsset* tSceneAsset, EntityId *out);

thermion_dart/native/include/c_api/ThermionDartRenderThreadApi.h

@@ -20,6 +20,8 @@ namespace thermion
         EMSCRIPTEN_KEEPALIVE void RenderTicker_renderRenderThread(TRenderTicker *tRenderTicker, uint64_t frameTimeInNanos,);
         // EMSCRIPTEN_KEEPALIVE void RenderLoop_addTask(TRenderLoop* tRenderLoop, void (*task)());
 
+        EMSCRIPTEN_KEEPALIVE void AnimationManager_createRenderThread(TEngine *tEngine, TScene *tScene, void (*onComplete)(TAnimationManager *));
+
         EMSCRIPTEN_KEEPALIVE void Engine_createRenderThread(
             TBackend backend,
             void* platform,
@@ -36,6 +38,7 @@ namespace thermion
         EMSCRIPTEN_KEEPALIVE void Engine_buildMaterialRenderThread(TEngine *tEngine, const uint8_t *materialData, size_t length, void (*onComplete)(TMaterial *));
         EMSCRIPTEN_KEEPALIVE void Engine_destroySwapChainRenderThread(TEngine *tEngine, TSwapChain *tSwapChain, void (*onComplete)());
         EMSCRIPTEN_KEEPALIVE void Engine_destroyMaterialRenderThread(TEngine *tEngine, TMaterial *tMaterial, void (*onComplete)());
+        EMSCRIPTEN_KEEPALIVE void Engine_destroyMaterialInstanceRenderThread(TEngine *tEngine, TMaterialInstance *tMaterialInstance, void (*onComplete)());
         EMSCRIPTEN_KEEPALIVE void Engine_destroySkyboxRenderThread(TEngine *tEngine, TSkybox *tSkybox, void (*onComplete)());
         EMSCRIPTEN_KEEPALIVE void Engine_destroyIndirectLightRenderThread(TEngine *tEngine, TIndirectLight *tIndirectLight, void (*onComplete)());
         EMSCRIPTEN_KEEPALIVE void Texture_buildRenderThread(TEngine *engine, 

thermion_dart/native/include/material/gizmo.S

@@ -8,5 +8,5 @@ GIZMO_PACKAGE:
 GIZMO_GIZMO_OFFSET:
     .int 0
 GIZMO_GIZMO_SIZE:
-    .int 45584
+    .int 45867
 

thermion_dart/native/include/material/gizmo.apple.S

@@ -8,5 +8,5 @@ _GIZMO_PACKAGE:
 _GIZMO_GIZMO_OFFSET:
     .int 0
 _GIZMO_GIZMO_SIZE:
-    .int 45584
+    .int 45867
 

thermion_dart/native/include/material/grid.S

@@ -8,5 +8,5 @@ GRID_PACKAGE:
 GRID_GRID_OFFSET:
     .int 0
 GRID_GRID_SIZE:
-    .int 52130
+    .int 52018
 

thermion_dart/native/include/material/grid.apple.S

@@ -8,5 +8,5 @@ _GRID_PACKAGE:
 _GRID_GRID_OFFSET:
     .int 0
 _GRID_GRID_SIZE:
-    .int 52130
+    .int 52018
 

thermion_dart/native/include/material/image.S

@@ -8,5 +8,5 @@ IMAGE_PACKAGE:
 IMAGE_IMAGE_OFFSET:
     .int 0
 IMAGE_IMAGE_SIZE:
-    .int 56612
+    .int 63850
 

thermion_dart/native/include/material/image.apple.S

@@ -8,5 +8,5 @@ _IMAGE_PACKAGE:
 _IMAGE_IMAGE_OFFSET:
     .int 0
 _IMAGE_IMAGE_SIZE:
-    .int 56612
+    .int 63850
 

thermion_dart/native/include/material/unlit.S

@@ -8,5 +8,5 @@ UNLIT_PACKAGE:
 UNLIT_UNLIT_OFFSET:
     .int 0
 UNLIT_UNLIT_SIZE:
-    .int 106370
+    .int 157994
 

thermion_dart/native/include/material/unlit.apple.S

@@ -8,5 +8,5 @@ _UNLIT_PACKAGE:
 _UNLIT_UNLIT_OFFSET:
     .int 0
 _UNLIT_UNLIT_SIZE:
-    .int 106370
+    .int 157994
 

thermion_dart/native/include/material/unlit_fixed_size.S

@@ -8,5 +8,5 @@ UNLIT_FIXED_SIZE_PACKAGE:
 UNLIT_FIXED_SIZE_UNLIT_FIXED_SIZE_OFFSET:
     .int 0
 UNLIT_FIXED_SIZE_UNLIT_FIXED_SIZE_SIZE:
-    .int 45632
+    .int 45907
 

thermion_dart/native/include/material/unlit_fixed_size.apple.S

@@ -8,5 +8,5 @@ _UNLIT_FIXED_SIZE_PACKAGE:
 _UNLIT_FIXED_SIZE_UNLIT_FIXED_SIZE_OFFSET:
     .int 0
 _UNLIT_FIXED_SIZE_UNLIT_FIXED_SIZE_SIZE:
-    .int 45632
+    .int 45907