Merge branch 'master' into for-0.56.0/sync

Author: illwieckz

CMakeLists.txt

@@ -141,12 +141,15 @@ if(NOT DAEMON_EXTERNAL_APP)
 
     set(NACL_RUNTIME_PATH "" CACHE STRING "Directory containing the NaCl binaries")
 
-    # Not supported on mac because the included version is too old
-    if(APPLE)
-        set(USE_CURSES OFF)
-    elseif(WIN32)
+    if (WIN32)
+        # The alternative code is based on non-curses unix terminal functions.
         set(USE_CURSES ON)
     else()
+        if (NOT APPLE)
+            # Not supported on macOS because the included version is too old.
+            option(USE_CURSES_NCURSES "Use ncurses instead of PDCursesMod" ON)
+        endif()
+
         option(USE_CURSES "Enable fancy colors in terminal's output" ON)
     endif()
 
@@ -657,20 +660,24 @@ endif()
 # Curses, pdcurses on Windows and ncursesw on Unix
 if (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP)
     if (USE_CURSES)
-        if (WIN32)
-            set(LIBS_ENGINE_BASE ${LIBS_ENGINE_BASE} gdi32 comdlg32)
+        if (USE_CURSES_NCURSES)
+            # Tells FindCurses that ncurses is required.
+            set(CURSES_NEED_NCURSES 1)
+
+            add_definitions(-DUSE_CURSES -DUSE_CURSES_NCURSES)
+            find_package(CursesW REQUIRED)
+            set(LIBS_ENGINE_BASE ${LIBS_ENGINE_BASE} ${CURSESW_LIBRARIES})
+            include_directories(${CURSESW_INCLUDE_DIR})
+        else ()
+            if (WIN32)
+                set(LIBS_ENGINE_BASE ${LIBS_ENGINE_BASE} gdi32 comdlg32)
+            endif()
 
             add_definitions(-DPDC_WIDE -DPDC_FORCE_UTF8 -DPDC_RGB -DUSE_CURSES)
             add_library(srclibs-pdcurses EXCLUDE_FROM_ALL ${PDCURSESLIST})
             set_target_properties(srclibs-pdcurses PROPERTIES POSITION_INDEPENDENT_CODE 1 FOLDER "libs")
             set(LIBS_ENGINE_BASE ${LIBS_ENGINE_BASE} srclibs-pdcurses)
             include_directories(${LIB_DIR}/pdcursesmod)
-        else ()
-            add_definitions(-DUSE_CURSES)
-            set(CURSES_NEED_NCURSES 1) # Tells FindCurses that ncurses is required
-            find_package(CursesW REQUIRED)
-            set(LIBS_ENGINE_BASE ${LIBS_ENGINE_BASE} ${CURSESW_LIBRARIES})
-            include_directories(${CURSESW_INCLUDE_DIR})
         endif()
     endif()
 endif()

src.cmake

@@ -86,6 +86,18 @@ if (DAEMON_PARENT_SCOPE_DIR)
     set(COMMONLIST ${COMMONLIST} PARENT_SCOPE)
 endif()
 
+# Tests for code shared by engine and gamelogic
+set(COMMONTESTLIST
+    ${LIB_DIR}/tinyformat/TinyformatTest.cpp
+    ${COMMON_DIR}/ColorTest.cpp
+    ${COMMON_DIR}/FileSystemTest.cpp
+    ${COMMON_DIR}/StringTest.cpp
+    ${COMMON_DIR}/cm/unittest.cpp
+    ${COMMON_DIR}/MathTest.cpp
+    ${COMMON_DIR}/UtilTest.cpp
+    ${ENGINE_DIR}/qcommon/q_math_test.cpp
+)
+
 set(RENDERERLIST
     ${ENGINE_DIR}/renderer/DetectGLVendors.cpp
     ${ENGINE_DIR}/renderer/DetectGLVendors.h
@@ -279,15 +291,8 @@ else()
     )
 endif()
 
-# Tests for engine-lib
-set(ENGINETESTLIST
-    ${LIB_DIR}/tinyformat/TinyformatTest.cpp
-    ${COMMON_DIR}/ColorTest.cpp
-    ${COMMON_DIR}/FileSystemTest.cpp
-    ${COMMON_DIR}/StringTest.cpp
-    ${COMMON_DIR}/cm/unittest.cpp
-    ${COMMON_DIR}/MathTest.cpp
-    ${COMMON_DIR}/UtilTest.cpp
+# Tests runnable for any engine variant
+set(ENGINETESTLIST ${COMMONTESTLIST}
     ${ENGINE_DIR}/framework/CommandSystemTest.cpp
 )
 

src/engine/qcommon/q_math.cpp

@@ -3199,39 +3199,19 @@ void TransInit( transform_t *t )
 	t->scale = 1.0f;
 }
 
-// copy a transform
-void TransCopy( const transform_t *in, transform_t *out )
-{
-	memcpy( out, in, sizeof( transform_t ) );
-}
-
 // apply a transform to a point
 void TransformPoint( const transform_t *t, const vec3_t in, vec3_t out )
 {
 	QuatTransformVector( t->rot, in, out );
 	VectorScale( out, t->scale, out );
 	VectorAdd( out, t->trans, out );
 }
-// apply the inverse of a transform to a point
-void TransformPointInverse( const transform_t *t, const vec3_t in, vec3_t out )
-{
-	VectorSubtract( in, t->trans, out );
-	VectorScale( out, 1.0f / t->scale, out );
-	QuatTransformVectorInverse( t->rot, out, out );
-}
 
 // apply a transform to a normal vector (ignore scale and translation)
 void TransformNormalVector( const transform_t *t, const vec3_t in, vec3_t out )
 {
 	QuatTransformVector( t->rot, in, out );
 }
-// apply the inverse of a transform to a normal vector (ignore scale
-// and translation)
-void TransformNormalVectorInverse( const transform_t *t, const vec3_t in,
-                                   vec3_t out )
-{
-	QuatTransformVectorInverse( t->rot, in, out );
-}
 
 // initialize a transform with a pure rotation
 void TransInitRotationQuat( const quat_t quat, transform_t *t )
@@ -3240,16 +3220,6 @@ void TransInitRotationQuat( const quat_t quat, transform_t *t )
 	VectorClear( t->trans );
 	t->scale = 1.0f;
 }
-void TransInitRotation( const vec3_t axis, float angle, transform_t *t )
-{
-	float sa = sinf( 0.5f * angle );
-	float ca = cosf( 0.5f * angle );
-	quat_t q;
-
-	VectorScale( axis, sa, q );
-	q[3] = ca;
-	TransInitRotationQuat( q, t );
-}
 // initialize a transform with a pure translation
 void TransInitTranslation( const vec3_t vec, transform_t *t )
 {
@@ -3292,16 +3262,6 @@ void TransAddRotationQuat( const quat_t quat, transform_t *t )
 	QuatMultiply2( tmp, t->rot );
 	QuatCopy( tmp, t->rot );
 }
-void TransAddRotation( const vec3_t axis, float angle, transform_t *t )
-{
-	float sa = sinf( 0.5f * angle );
-	float ca = cosf( 0.5f * angle );
-	quat_t q;
-
-	VectorScale( axis, sa, q );
-	q[3] = ca;
-	TransAddRotationQuat( q, t );
-}
 
 // add a scale to the start of an existing transform
 void TransInsScale( float factor, transform_t *t )
@@ -3319,9 +3279,9 @@ void TransAddScale( float factor, transform_t *t )
 void TransInsTranslation( const vec3_t vec, transform_t *t )
 {
 	vec3_t tmp;
-
-	TransformPoint( t, vec, tmp );
-	VectorAdd( t->trans, tmp, t->trans );
+	QuatTransformVector( t->rot, vec, tmp );
+	VectorScale( tmp, t->scale, tmp );
+	VectorAdd( tmp, t->trans, t->trans );
 }
 
 // add a translation at the end of an existing transformation
@@ -3334,7 +3294,7 @@ void TransAddTranslation( const vec3_t vec, transform_t *t )
 void TransCombine( const transform_t *a, const transform_t *b,
                    transform_t *out )
 {
-	TransCopy( a, out );
+	*out = *a;
 
 	TransAddRotationQuat( b->rot, out );
 	TransAddScale( b->scale, out );
@@ -3345,15 +3305,15 @@ void TransCombine( const transform_t *a, const transform_t *b,
 void TransInverse( const transform_t *in, transform_t *out )
 {
 	quat_t inverse;
-	static transform_t tmp; // static for proper alignment in QVMs
+	transform_t tmp;
 
 	TransInit( &tmp );
 	VectorNegate( in->trans, tmp.trans );
 	TransAddScale( 1.0f / in->scale, &tmp );
 	QuatCopy( in->rot, inverse );
 	QuatInverse( inverse );
 	TransAddRotationQuat( inverse, &tmp );
-	TransCopy( &tmp, out );
+	*out = tmp;
 }
 
 // lerp between transforms