Merge pull request #12 from smlu/develop

v0.2

.editorconfig

@@ -0,0 +1,85 @@
+# Visual Studio generated .editorconfig file with C++ settings.
+root = true
+
+[*.{c,c++,cc,cpp,cppm,cu,cuh,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}]
+
+# Visual C++ Code Style settings
+
+cpp_generate_documentation_comments = doxygen_slash_star
+
+# Visual C++ Formatting settings
+
+cpp_indent_braces = false
+cpp_indent_multi_line_relative_to = innermost_parenthesis
+cpp_indent_within_parentheses = indent
+cpp_indent_preserve_within_parentheses = false
+cpp_indent_case_contents = true
+cpp_indent_case_labels = true
+cpp_indent_case_contents_when_block = false
+cpp_indent_lambda_braces_when_parameter = false
+cpp_indent_goto_labels = one_left
+cpp_indent_preprocessor = one_left 
+cpp_indent_access_specifiers = false
+cpp_indent_namespace_contents = true
+cpp_indent_preserve_comments = true
+
+cpp_new_line_before_open_brace_namespace = ignore
+cpp_new_line_before_open_brace_type = ignore
+cpp_new_line_before_open_brace_function = ignore
+cpp_new_line_before_open_brace_block = ignore
+cpp_new_line_before_open_brace_lambda = ignore
+cpp_new_line_scope_braces_on_separate_lines = true
+cpp_new_line_close_brace_same_line_empty_type = true
+cpp_new_line_close_brace_same_line_empty_function = true
+cpp_new_line_before_catch = true
+cpp_new_line_before_else = true
+cpp_new_line_before_while_in_do_while = false
+
+cpp_space_before_function_open_parenthesis = remove
+cpp_space_within_parameter_list_parentheses = false
+cpp_space_between_empty_parameter_list_parentheses = false
+cpp_space_after_keywords_in_control_flow_statements = true
+cpp_space_within_control_flow_statement_parentheses = true
+cpp_space_before_lambda_open_parenthesis = false
+cpp_space_within_cast_parentheses = false
+cpp_space_after_cast_close_parenthesis = false
+cpp_space_within_expression_parentheses = false
+cpp_space_before_block_open_brace = true
+cpp_space_between_empty_braces = false
+cpp_space_before_initializer_list_open_brace = false
+cpp_space_within_initializer_list_braces = true
+cpp_space_preserve_in_initializer_list = true
+cpp_space_before_open_square_bracket = false
+cpp_space_within_square_brackets = false
+cpp_space_before_empty_square_brackets = false
+cpp_space_between_empty_square_brackets = false
+cpp_space_group_square_brackets = true
+cpp_space_within_lambda_brackets = false
+cpp_space_between_empty_lambda_brackets = false
+cpp_space_before_comma = false
+cpp_space_after_comma = true
+cpp_space_remove_around_member_operators = true
+cpp_space_before_inheritance_colon = true
+cpp_space_before_constructor_colon = true
+cpp_space_remove_before_semicolon = true
+cpp_space_after_semicolon = true
+cpp_space_remove_around_unary_operator = true
+cpp_space_around_binary_operator = insert
+cpp_space_around_assignment_operator = ignore
+cpp_space_pointer_reference_alignment = left
+cpp_space_around_ternary_operator = insert
+
+cpp_use_unreal_engine_macro_formatting = false
+cpp_wrap_preserve_blocks = one_liners
+
+# Visual C++ Inlcude Cleanup settings
+
+cpp_include_cleanup_add_missing_error_tag_type = suggestion
+cpp_include_cleanup_remove_unused_error_tag_type = dimmed
+cpp_include_cleanup_optimize_unused_error_tag_type = suggestion
+cpp_include_cleanup_sort_after_edits = true
+cpp_sort_includes_error_tag_type = suggestion
+cpp_sort_includes_priority_case_sensitive = false
+cpp_sort_includes_priority_style = quoted
+cpp_includes_style = default
+cpp_includes_use_forward_slash = true

CHANGELOG

@@ -1,4 +1,45 @@
-v0.1
+# v0.2
+General:
+  - Fixed various bugs
+  - Fixed floating point precision bug in `rdVector` & `rdMatrix34` functions (3b800ad)
+  - Made OpenJones3D binaries portable by adding absolute resource dir path to JonesFile VFS (fca6ef2)
+    This change allows binaries to be placed in any arbitrary location, eliminating the requirement for a Resource folder.
+  - Fixed typo in framerate output text (47537aa)
+  - Fixed initializing and clearing resource array on `JonesFile_Close` (47537aa)
+  - Fixed the invocation of `jonesString_GetString("JONES_STR_LOADERROR")` on every call to `JonesMain_ProcessGamesaveState` when there is no load error or the game is not being restored (47537aa)
+  - Fixed error text when it was cached by `jonesString_GetString` in call to `JonesMain_LogErrorToFile` (485d553)
+  - Changed the location of `JonesError.txt` to be always written in current working directory instead of installed path (485d553)  
+    This change resolves a potential fatal error that could occur when writing the error log due to the registry system failing to startup.
+  - Changed warning log to output to console or file (dcd3015)
+  - Made console log output colorized (dcd3015)
+  - Added debugger log output (dcd3015)
+  - Removed material buffer size constraint when loading material section form NDY level file in `sithMaterial_LoadMaterialsText` (dcd3015) 
+  - Fixed potential infinitive loop bug when .uni file is missing line break at the end of file (6b71793)
+  - Implemented `sithSurface` module (b448041)
+
+Display & Render:
+  - Fixed scaling of color component when converting pixel data row in `stdColor_ColorConvertOneRow` (9e6ba77)
+  - Changed default engine texture format to 32 bit from 16 bit (249a416)
+  - Removed support for 16 bpp textures (3152496)
+  - Increased `rdCache` vertex buffer size to 32768 * 64 (25ceaba)
+  - Increased `rdModel3` (.3DO) mesh constraints based on `rdCache` constraints (a008386)
+  - Increased max no. of sectors in camera view to 4096 (b448041)
+  - Increased max no. of thing with sectors to 8192 (b448041)
+
+Game play:
+  - Changed to by default play the higher resolution intro movie (800x600) (ffa2e9d)
+  - Fixed retrieving model by index number when loading savegame (669904d)
+    This change adds temporary wrapper function `sithModel_GetModelByIndexWrap`.
+  - Added support for 24/32 bit textures to CND cnd file format  (91d0a87)
+  - Changed how developer dialog discovers level files (30630d1)
+    Now dialog first looks for ndy folder in current working directory, and if found searches for level files in that folder. If ndy folder is not found the dialog checks for level files in `Install Path\Resource\ndy`.
+  - Fixed searching for ndy level file when corresponding cnd file is not found (5e64e5b)
+    When game progresses to the next level this enables using ndy file for original levels when the corresponding cnd file is not found 
+
+HUD:
+  - Fixed drawing of horizontal wall line (8046835)
+
+# v0.1
 General:
   - Fixed minor bugs
   - Improve game loading times by disabling VSync and blt frame buffers instead of flip.
@@ -15,7 +56,6 @@ General:
   - (`JonesFile`) Fixed path buffer size to 128 chars, was 48 chars
   - (`JonesFile`) Fixed writing to file by using correct file write function in `JonesFile_FilePrintf`
   - Added bounds check for number of animating joints when loading keyframe from *.key file
-  - Made save/load dialogs resizable
   - Fixed a bug in sound compression where clipping of the audio waveform occurred
   - Fixed infinitive loop bug when voice subtitle contains too long word (`sithVoice_AddSubtitle`)
 

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
-project(OpenJones3D VERSION 0.1.0)
+project(OpenJones3D VERSION 0.2.0)
 
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
@@ -18,7 +18,7 @@ configure_file(
 )
 
 # Set global property for MSVC runtime library (CMake 3.15+)
-set(CMAKE_MSVC_RUNTIME_LIBRARY "$<$<CONFIG:Release>:MultiThreaded>$<$<CONFIG:Debug>:MultiThreadedDebug>")
+set(CMAKE_MSVC_RUNTIME_LIBRARY "$<$<CONFIG:Release>:MultiThreaded>$<$<CONFIG:MinSizeRel>:MultiThreaded>")
 
 if (MSVC)
     add_compile_definitions("__BASE_FILE__=\"%(Filename)%(Extension)\"")

Jones3D/Display/JonesDisplay.c

@@ -514,28 +514,28 @@ int JonesDisplay_ShowSplashDemo(void)
         int numPressed;
         stdControl_ReadControls();
         if ( stdControl_ReadKey(DIK_ESCAPE, &numPressed)
-          || stdControl_ReadKey(DIK_SPACE, &numPressed)
-          || stdControl_ReadKey(DIK_F1, &numPressed)
-          || stdControl_ReadKey(DIK_F2, &numPressed)
-          || stdControl_ReadKey(DIK_F3, &numPressed)
-          || stdControl_ReadKey(DIK_F4, &numPressed)
-          || stdControl_ReadKey(DIK_F5, &numPressed)
-          || stdControl_ReadKey(DIK_F6, &numPressed)
-          || stdControl_ReadKey(DIK_F7, &numPressed)
-          || stdControl_ReadKey(DIK_F8, &numPressed)
-          || stdControl_ReadKey(DIK_F9, &numPressed)
-          || stdControl_ReadKey(DIK_F10, &numPressed)
-          || stdControl_ReadKey(DIK_F11, &numPressed)
-          || stdControl_ReadKey(DIK_F12, &numPressed)
-          || stdControl_ReadKey(DIK_RETURN, &numPressed)
-          || stdControl_ReadKey(DIK_NUMPADENTER, &numPressed)
-          || stdControl_ReadKey(DIK_RCONTROL, &numPressed)
-          || stdControl_ReadKey(DIK_LCONTROL, &numPressed)
-          || stdControl_ReadKey(DIK_RMENU, &numPressed)
-          || stdControl_ReadKey(DIK_LMENU, &numPressed)
-          || stdControl_ReadKey(DIK_Q, &numPressed)
-          || stdControl_ReadKey(DIK_X, &numPressed)
-          || stdControl_ReadKey(DIK_W, &numPressed) )
+            || stdControl_ReadKey(DIK_SPACE, &numPressed)
+            || stdControl_ReadKey(DIK_F1, &numPressed)
+            || stdControl_ReadKey(DIK_F2, &numPressed)
+            || stdControl_ReadKey(DIK_F3, &numPressed)
+            || stdControl_ReadKey(DIK_F4, &numPressed)
+            || stdControl_ReadKey(DIK_F5, &numPressed)
+            || stdControl_ReadKey(DIK_F6, &numPressed)
+            || stdControl_ReadKey(DIK_F7, &numPressed)
+            || stdControl_ReadKey(DIK_F8, &numPressed)
+            || stdControl_ReadKey(DIK_F9, &numPressed)
+            || stdControl_ReadKey(DIK_F10, &numPressed)
+            //|| stdControl_ReadKey(DIK_F11, &numPressed)
+            || stdControl_ReadKey(DIK_F12, &numPressed)
+            || stdControl_ReadKey(DIK_RETURN, &numPressed)
+            || stdControl_ReadKey(DIK_NUMPADENTER, &numPressed)
+            || stdControl_ReadKey(DIK_RCONTROL, &numPressed)
+            || stdControl_ReadKey(DIK_LCONTROL, &numPressed)
+            || stdControl_ReadKey(DIK_RMENU, &numPressed)
+            || stdControl_ReadKey(DIK_LMENU, &numPressed)
+            || stdControl_ReadKey(DIK_Q, &numPressed)
+            || stdControl_ReadKey(DIK_X, &numPressed)
+            || stdControl_ReadKey(DIK_W, &numPressed) )
         {
             bFinish = 1;
         }
@@ -549,7 +549,7 @@ int JonesDisplay_ShowSplashDemo(void)
             }
 
             rdWallpaper_Free(pWallpaper);
-            pWallpaper = 0;
+            pWallpaper = NULL;
             return 0;
         }