Added the ability to dynamically initialize any renderobject that has…

… a TSP,cleaned up unused TSP variables and functions,added the ability to load type 2 and 6 primitive types
AdrianoDiDio · Apr 1, 2024 · 0d4f5d6 · 0d4f5d6
1 parent 91b9d96
commit 0d4f5d6
Show file tree

Hide file tree

Showing 5 changed files with 126 additions and 520 deletions.
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
@@ -45,7 +45,6 @@ set(IMGUI_SOURCE_FILES cimgui/cimgui.cpp
 
 add_library(cimgui STATIC ${IMGUI_SOURCE_FILES})
 target_compile_definitions(cimgui PRIVATE "IMGUI_USER_CONFIG=\"${PROJECT_SOURCE_DIR}/src/Common/IMGUIConfig.h\"")
-
 target_include_directories(cimgui PRIVATE cimgui/imgui)
 target_link_libraries(cimgui SDL2)
 

diff --git a/src/JPModelViewer/BSD.c b/src/JPModelViewer/BSD.c
@@ -803,17 +803,14 @@ void BSDDrawRenderObject(BSDRenderObject_t *RenderObject,const VRAM_t *VRAM,Came
     mat4 ModelViewMatrix;
     mat4 MVPMatrix;
     Shader_t *Shader;
-    static int Once = 0;
 
     if( !RenderObject ) {
         return;
     }
 
     if( RenderObject->TSP ) {
-        if( !Once ) {
+        if( !RenderObject->RenderObjectShader ) {
             BSDCreateRenderObjectShader(RenderObject);
-            TSPCreateVAOs(RenderObject->TSP);
-            Once = 1;
         }
         TSPDrawList(RenderObject->TSP,VRAM,Camera,RenderObject->RenderObjectShader,ProjectionMatrix);
         return;

diff --git a/src/JPModelViewer/CMakeLists.txt b/src/JPModelViewer/CMakeLists.txt
@@ -26,6 +26,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX -Debug)
 set_target_properties(${PROJECT_NAME} PROPERTIES RELEASE_POSTFIX -Release)
 
 target_compile_options(${PROJECT_NAME} PRIVATE "-fdiagnostics-color=always")
+target_compile_options(${PROJECT_NAME} PRIVATE "-Wno-unknown-pragmas")
 if(WIN32)
   target_compile_options(${PROJECT_NAME} PRIVATE -Wall)
   target_compile_definitions(${PROJECT_NAME} PRIVATE "-DSDL_MAIN_HANDLED")