Math 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

CMakeLists.txt

@@ -6,4 +6,6 @@ project(rrr3d VERSION ${RRR3D_VERSION} LANGUAGES CXX)
 
 include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin")
+
 add_subdirectory(src)

src/CMakeLists.txt

@@ -9,6 +9,7 @@ if (MSVC)
 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}")
@@ -18,7 +17,6 @@ add_library(${PROJECT_NAME} STATIC
 target_include_directories(${PROJECT_NAME} PRIVATE
     header
     ${CMAKE_SOURCE_DIR}/extern/tinyxml/include
-    ${CMAKE_SOURCE_DIR}/extern/directx/include
 )
 
 target_link_libraries(${PROJECT_NAME})

src/LexStd/header/lslAutoRef.h

@@ -38,22 +38,22 @@ class BaseAutoRef
 			for (_RefList::iterator iter = _nextRefList.begin(); iter != _nextRefList.end(); ++iter)
 			{
 				(*iter)->_prevRef = 0;
-				if (_prevRef)	
+				if (_prevRef)
 				{
-					(*iter)->_prevRef = _prevRef;	
+					(*iter)->_prevRef = _prevRef;
 				}
-				else if (iter != _nextRefList.begin())	
+				else if (iter != _nextRefList.begin())
 				{
 					(*iter)->_prevRef = *_nextRefList.begin();
 				}
 
-				if ((*iter)->_prevRef)									
+				if ((*iter)->_prevRef)
 					(*iter)->_prevRef->_nextRefList.push_back(*iter);
 			}
 			_nextRefList.clear();
 
 			if (_prevRef)
-				_prevRef->_nextRefList.remove(this);		
+				_prevRef->_nextRefList.remove(this);
 		}
 
 		return false;
@@ -66,7 +66,7 @@ template<class _Ref> class AutoRef: public BaseAutoRef
 {
 	template<class _Ref> friend class AutoRef;
 private:
-	typedef AutoRef<_Ref> _MyClass;	
+	typedef AutoRef<_Ref> _MyClass;
 	typedef BaseAutoRef _MyBase;
 	typedef std::list<_MyClass*> _RefList;
 private:
@@ -83,7 +83,7 @@ template<class _Ref> class AutoRef: public BaseAutoRef
 	void FreeRef()
 	{
 		bool isFree = _MyBase::FreeRef(_owner);
-		
+
 		//�������� �� ��������������� �������� ������
 		LSL_ASSERT(!(isFree && _ref && _ref->GetRefCnt() > 1));
 
@@ -187,7 +187,7 @@ template<class _Ref> class AutoRef: public BaseAutoRef
 	bool operator!=(const _Ref* value) const
 	{
 		return _ref != value;
-	}	
+	}
 };
 
 }