dxvk-glm changes

.clang-format

@@ -0,0 +1,143 @@
+BasedOnStyle: Microsoft
+
+# To apply code style please run:
+# find ./src -iname *.h -o -iname *.cpp | xargs clang-format -i
+
+# To dump Microsoft style options run:
+# clang-format -style=microsoft -dump-config > .clang-format
+# ---
+# Language:        Cpp
+# AccessModifierOffset: -2
+# AlignAfterOpenBracket: Align
+# AlignConsecutiveMacros: false
+# AlignConsecutiveAssignments: false
+# AlignConsecutiveDeclarations: false
+# AlignEscapedNewlines: Right
+# AlignOperands:   true
+# AlignTrailingComments: true
+# AllowAllArgumentsOnNextLine: true
+# AllowAllConstructorInitializersOnNextLine: true
+# AllowAllParametersOfDeclarationOnNextLine: true
+# AllowShortBlocksOnASingleLine: Never
+# AllowShortCaseLabelsOnASingleLine: false
+# AllowShortFunctionsOnASingleLine: None
+# AllowShortLambdasOnASingleLine: All
+# AllowShortIfStatementsOnASingleLine: Never
+# AllowShortLoopsOnASingleLine: false
+# AlwaysBreakAfterDefinitionReturnType: None
+# AlwaysBreakAfterReturnType: None
+# AlwaysBreakBeforeMultilineStrings: false
+# AlwaysBreakTemplateDeclarations: MultiLine
+# BinPackArguments: true
+# BinPackParameters: true
+# BraceWrapping:
+  # AfterCaseLabel:  false
+  # AfterClass:      true
+  # AfterControlStatement: true
+  # AfterEnum:       true
+  # AfterFunction:   true
+  # AfterNamespace:  true
+  # AfterObjCDeclaration: true
+  # AfterStruct:     true
+  # AfterUnion:      false
+  # AfterExternBlock: true
+  # BeforeCatch:     true
+  # BeforeElse:      true
+  # IndentBraces:    false
+  # SplitEmptyFunction: true
+  # SplitEmptyRecord: true
+  # SplitEmptyNamespace: true
+# BreakBeforeBinaryOperators: None
+# BreakBeforeBraces: Custom
+# BreakBeforeInheritanceComma: false
+# BreakInheritanceList: BeforeColon
+# BreakBeforeTernaryOperators: true
+# BreakConstructorInitializersBeforeComma: false
+# BreakConstructorInitializers: BeforeColon
+# BreakAfterJavaFieldAnnotations: false
+# BreakStringLiterals: true
+# ColumnLimit:     120
+# CommentPragmas:  '^ IWYU pragma:'
+# CompactNamespaces: false
+# ConstructorInitializerAllOnOneLineOrOnePerLine: false
+# ConstructorInitializerIndentWidth: 4
+# ContinuationIndentWidth: 4
+# Cpp11BracedListStyle: true
+# DeriveLineEnding: true
+# DerivePointerAlignment: false
+# DisableFormat:   false
+# ExperimentalAutoDetectBinPacking: false
+# FixNamespaceComments: true
+# ForEachMacros:
+  # - foreach
+  # - Q_FOREACH
+  # - BOOST_FOREACH
+# IncludeBlocks:   Preserve
+# IncludeCategories:
+  # - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    # Priority:        2
+    # SortPriority:    0
+  # - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    # Priority:        3
+    # SortPriority:    0
+  # - Regex:           '.*'
+    # Priority:        1
+    # SortPriority:    0
+# IncludeIsMainRegex: '(Test)?$'
+# IncludeIsMainSourceRegex: ''
+# IndentCaseLabels: false
+# IndentGotoLabels: true
+# IndentPPDirectives: None
+# IndentWidth:     4
+# IndentWrappedFunctionNames: false
+# JavaScriptQuotes: Leave
+# JavaScriptWrapImports: true
+# KeepEmptyLinesAtTheStartOfBlocks: true
+# MacroBlockBegin: ''
+# MacroBlockEnd:   ''
+# MaxEmptyLinesToKeep: 1
+# NamespaceIndentation: None
+# ObjCBinPackProtocolList: Auto
+# ObjCBlockIndentWidth: 2
+# ObjCSpaceAfterProperty: false
+# ObjCSpaceBeforeProtocolList: true
+# PenaltyBreakAssignment: 2
+# PenaltyBreakBeforeFirstCallParameter: 19
+# PenaltyBreakComment: 300
+# PenaltyBreakFirstLessLess: 120
+# PenaltyBreakString: 1000
+# PenaltyBreakTemplateDeclaration: 10
+# PenaltyExcessCharacter: 1000000
+# PenaltyReturnTypeOnItsOwnLine: 1000
+# PointerAlignment: Right
+# ReflowComments:  true
+# SortIncludes:    true
+# SortUsingDeclarations: true
+# SpaceAfterCStyleCast: false
+# SpaceAfterLogicalNot: false
+# SpaceAfterTemplateKeyword: true
+# SpaceBeforeAssignmentOperators: true
+# SpaceBeforeCpp11BracedList: false
+# SpaceBeforeCtorInitializerColon: true
+# SpaceBeforeInheritanceColon: true
+# SpaceBeforeParens: ControlStatements
+# SpaceBeforeRangeBasedForLoopColon: true
+# SpaceInEmptyBlock: false
+# SpaceInEmptyParentheses: false
+# SpacesBeforeTrailingComments: 1
+# SpacesInAngles:  false
+# SpacesInConditionalStatement: false
+# SpacesInContainerLiterals: true
+# SpacesInCStyleCastParentheses: false
+# SpacesInParentheses: false
+# SpacesInSquareBrackets: false
+# SpaceBeforeSquareBrackets: false
+# Standard:        Latest
+# StatementMacros:
+  # - Q_UNUSED
+  # - QT_REQUIRE_VERSION
+# TabWidth:        4
+# UseCRLF:         false
+UseTab:            AlignWithSpaces
+# ...
+

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Install Windows libs
       shell: cmd
       run: |
-        curl -LJO https://github.com/q4a/rrr3d/releases/download/1.3.1-dev2/extern.7z
+        curl -LJO https://github.com/q4a/rrr3d/releases/download/1.3.1-dev3/extern.7z
         7z x extern.7z
         dir
     - uses: ilammy/msvc-dev-cmd@v1
@@ -30,3 +30,8 @@ jobs:
         useVcpkgToolchainFile: false
         buildDirectory: '${{ github.workspace }}/build'
         configurationRegexFilter: '${{ matrix.configuration }}'
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: rrr3d.${{ matrix.configuration }}
+        path: bin

.gitignore

@@ -1,4 +1,5 @@
 build*
+cmake-build-*
 bin
 extern
 .vs

CMakeLists.txt

@@ -1,9 +1,45 @@
-cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
 cmake_policy(VERSION 3.12)
 
 set(RRR3D_VERSION "1.3.1")
 project(rrr3d VERSION ${RRR3D_VERSION} LANGUAGES CXX)
 
 include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
 
+### Set up output paths
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug)
+
+if (MSVC)
+    # DirectX SDK libs
+    include_directories("${CMAKE_SOURCE_DIR}/extern/directx/include")
+else()
+    # Non Windows target specifics
+
+    include(ExternalProject)
+
+    # DXVK-native wrapper lib retrieval and building
+    ExternalProject_Add(dxvk-native
+            GIT_REPOSITORY    https://github.com/Joshua-Ashton/dxvk-native
+            GIT_TAG           origin/master
+            GIT_SHALLOW       ON
+            BUILD_ALWAYS      OFF
+            CONFIGURE_COMMAND meson ../dxvk-native
+            BUILD_COMMAND     ninja
+            INSTALL_COMMAND   ""
+    )
+    ExternalProject_Get_property(dxvk-native SOURCE_DIR BINARY_DIR)
+    set(DXVK_NATIVE_INCLUDE_DIRS
+            "${SOURCE_DIR}/include/native/directx"
+            "${SOURCE_DIR}/include/native/windows"
+    )
+    set(DXVK_NATIVE_D3D9_LIB ${BINARY_DIR}/src/d3d9/libdxvk_d3d9.so)
+    include_directories(
+        "${CMAKE_SOURCE_DIR}/src/Platform"
+        "${DXVK_NATIVE_INCLUDE_DIRS}"
+    )
+    ADD_CUSTOM_TARGET(dependencies ALL DEPENDS dxvk-native)
+endif()
+
 add_subdirectory(src)

src/CMakeLists.txt

@@ -6,9 +6,12 @@ if (MSVC)
     add_compile_options(/W3) # Warning level
 
     add_compile_options("$<$<CONFIG:Release>:/Gy>") # Enable Function-Level Linking
+else()
+    add_compile_options(-fPIC)
 endif()
 
 add_subdirectory(LexStd)
+add_subdirectory(MathLib)
 add_subdirectory(NetLib)
 add_subdirectory(Rock3dEngine)
 add_subdirectory(Rock3dGame)

src/LexStd/CMakeLists.txt

@@ -4,7 +4,6 @@ add_definitions(-DNOMINMAX) # Use std::max()/std::min()
 
 list(APPEND PROJECT_DIRS
     "header"
-    "header/d3d"
     "source"
     )
 add_dir("${PROJECT_DIRS}" "${PROJECT_NAME}")
@@ -17,8 +16,8 @@ add_library(${PROJECT_NAME} STATIC
 
 target_include_directories(${PROJECT_NAME} PRIVATE
     header
+    ${CMAKE_SOURCE_DIR}/src/XPlatform/header
     ${CMAKE_SOURCE_DIR}/extern/tinyxml/include
-    ${CMAKE_SOURCE_DIR}/extern/directx/include
 )
 
 target_link_libraries(${PROJECT_NAME})

src/LexStd/header/EulerAngles.h

@@ -1,7 +1,7 @@
 /**** EulerAngles.h - Support for 24 angle schemes ****/
 /* Ken Shoemake, 1993 */
 #ifndef _H_EulerAngles
-#define _H_EulerAngles 
+#define _H_EulerAngles
 
 /**** QuatTypes.h - Basic type declarations ****/
 #ifndef _H_QuatTypes
@@ -11,7 +11,7 @@ typedef struct {float x, y, z, w;} Quat; /* Quaternion */
 enum QuatPart {X, Y, Z, W};
 typedef float HMatrix[4][4]; /* Right-handed, for column vectors */
 typedef Quat EulerAngles;    /* (x,y,z)=ang 1,2,3, w=order code  */
-#endif 
+#endif
 
 /*** Order type constants, constructors, extractors ***/
     /* There are 24 possible conventions, designated by:    */
@@ -26,8 +26,8 @@ typedef Quat EulerAngles;    /* (x,y,z)=ang 1,2,3, w=order code  */
     /* {a,b,c,ord} means Rz(c)Ry(b)Rx(a), where Rz(c)v	    */
     /* rotates v around Z by c radians.			    */
 #define EulFrmS	     0
-#define EulFrmR	     1 
-#define EulFrm(ord)  ((unsigned)(ord)&1)  
+#define EulFrmR	     1
+#define EulFrm(ord)  ((unsigned)(ord)&1)
 #define EulRepNo     0
 #define EulRepYes    1
 #define EulRep(ord)  (((unsigned)(ord)>>1)&1)
@@ -77,4 +77,4 @@ Quat Eul_ToQuat(EulerAngles ea);
 void Eul_ToHMatrix(EulerAngles ea, HMatrix M);
 EulerAngles Eul_FromHMatrix(HMatrix M, int order);
 EulerAngles Eul_FromQuat(Quat q, int order);
-#endif 
+#endif