Rend2 unified wip

.github/workflows/build.yml

@@ -395,6 +395,26 @@ jobs:
             artifact_name: OpenJO-rend2-macos-x86_64.tar.gz
             zip: false
 
+          - artifact_dir: OpenJO-windows-x86-Release-Non-Portable/JediOutcast
+            artifact_name: OpenJO-windows-x86.zip
+            zip: true
+
+          - artifact_dir: OpenJO-windows-x86_64-Release-Non-Portable/JediOutcast
+            artifact_name: OpenJO-windows-x86_64.zip
+            zip: true
+
+          - artifact_dir: OpenJO-linux-x86-Release-Non-Portable
+            artifact_name: OpenJO-linux-x86.tar.gz
+            zip: false
+
+          - artifact_dir: OpenJO-linux-x86_64-Release-Non-Portable
+            artifact_name: OpenJO-linux-x86_64.tar.gz
+            zip: false
+
+          - artifact_dir: OpenJO-macos-x86_64-Release-Non-Portable
+            artifact_name: OpenJO-macos-x86_64.tar.gz
+            zip: false
+
     steps:
       - uses: actions/checkout@v3
         with:

CMakeLists.txt

@@ -1,17 +1,17 @@
 #============================================================================
 # Copyright (C) 2013 - 2018, OpenJK contributors
-# 
+#
 # This file is part of the OpenJK source code.
-# 
+#
 # OpenJK is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 #============================================================================
@@ -67,7 +67,7 @@ set(UseInternalPNGDefault    OFF)
 set(UseInternalJPEGDefault   OFF)
 set(UseInternalSDL2Default   OFF)
 
-if(WIN32)
+if(UseInternalLibs OR WIN32)
   set(UseInternalOpenALDefault ON)
   set(UseInternalZlibDefault   ON)
   set(UseInternalPNGDefault    ON)
@@ -252,7 +252,7 @@ elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" M
 
 	# enable somewhat modern C++
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-	
+
 	if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-comment")

Dockerfile

@@ -16,7 +16,7 @@ RUN mkdir /usr/src/openjk/build.i386 &&\
 	cmake -DCMAKE_TOOLCHAIN_FILE=/usr/src/openjk/cmake/Toolchains/linux-i686.cmake \
 		-DCMAKE_INSTALL_PREFIX=/opt \
 		-DBuildMPCGame=OFF -DBuildMPEngine=OFF -DBuildMPRdVanilla=OFF -DBuildMPUI=OFF \
-		-DBuildSPEngine=OFF -DBuildSPGame=OFF -DBuildSPRdVanilla=OFF \
+		-DBuildSPEngine=OFF -DBuildSPGame=OFF -DBuildSPRdVanilla=OFF -DBuildMPRend2=OFF \
 		.. &&\
 	make &&\
 	make install
@@ -26,7 +26,7 @@ RUN mkdir /usr/src/openjk/build.x86_64 &&\
 	cd /usr/src/openjk/build.x86_64 &&\
 	cmake -DCMAKE_INSTALL_PREFIX=/opt \
 		-DBuildMPCGame=OFF -DBuildMPEngine=OFF -DBuildMPRdVanilla=OFF -DBuildMPUI=OFF \
-		-DBuildSPEngine=OFF -DBuildSPGame=OFF -DBuildSPRdVanilla=OFF \
+		-DBuildSPEngine=OFF -DBuildSPGame=OFF -DBuildSPRdVanilla=OFF -DBuildMPRend2=OFF \
 		.. &&\
 	make &&\
 	make install

cmake/Modules/InstallConfig.cmake

@@ -1,17 +1,17 @@
 #============================================================================
 # Copyright (C) 2015, OpenJK contributors
-# 
+#
 # This file is part of the OpenJK source code.
-# 
+#
 # OpenJK is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 #============================================================================
@@ -71,7 +71,7 @@ if(WIN32)
 	set(CPACK_NSIS_PACKAGE_NAME "OpenJK")
 	set(CPACK_NSIS_MUI_ICON "${SharedDir}/icons/icon.ico")
 	set(CPACK_NSIS_MUI_UNIICON "${SharedDir}/icons/icon.ico")
-	set(CPACK_NSIS_URL_INFO_ABOUT "http://openjk.org")
+	set(CPACK_NSIS_URL_INFO_ABOUT "https://openjk.org")
 
 	set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
 	include(InstallRequiredSystemLibraries)
@@ -121,8 +121,8 @@ if(WIN32)
 	endif()
 
 	# Don't run this for now until we have JK2 SP working
-	if(FALSE AND BuildJK2SPEngine)
-		string(REPLACE "/" "\\\\" ICON "${SPDir}/win32/starwars.ico")
+	if(BuildJK2SPEngine)
+		string(REPLACE "/" "\\\\" ICON "${JK2SPDir}/win32/starwars.ico")
 		set(CPACK_NSIS_CREATE_ICONS_EXTRA
 			"${CPACK_NSIS_CREATE_ICONS_EXTRA}
 			CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Jedi Outcast SP.lnk' \\\\

code/client/cl_cgame.cpp

@@ -1006,7 +1006,7 @@ intptr_t CL_CgameSystemCalls( intptr_t *args ) {
 	case CG_R_GETLIGHTING:
 		return re.GetLighting( (const float * ) VMA(1), (float *) VMA(2), (float *) VMA(3), (float *) VMA(4) );
 	case CG_R_ADDPOLYTOSCENE:
-		re.AddPolyToScene( args[1], args[2], (const polyVert_t *) VMA(3) );
+		re.AddPolyToScene( args[1], args[2], (const polyVert_t *) VMA(3), 1 );
 		return 0;
 	case CG_R_ADDLIGHTTOSCENE:
 		re.AddLightToScene( (const float *) VMA(1), VMF(2), VMF(3), VMF(4), VMF(5) );

code/client/cl_cin.cpp

@@ -1667,7 +1667,7 @@ static void CIN_AddTextCrawl()
 
 	// render it out
 	re.ClearScene();
-	re.AddPolyToScene( cinTable[CL_handle].hCRAWLTEXT, 4, verts );
+	re.AddPolyToScene( cinTable[CL_handle].hCRAWLTEXT, 4, verts, 1 );
 	re.RenderScene( &refdef );
 
 	//time's up

code/client/cl_ui.cpp

@@ -264,7 +264,7 @@ void CL_InitUI( void ) {
 #endif
 	uii.R_ClearScene			= re.ClearScene;
 	uii.R_AddRefEntityToScene	= re.AddRefEntityToScene;
-	uii.R_AddPolyToScene		=  re.AddPolyToScene;
+	uii.R_AddPolyToScene		= re.AddPolyToScene;
 	uii.R_AddLightToScene		= re.AddLightToScene;
 	uii.R_RenderScene			= re.RenderScene;
 

code/rd-common/tr_public.h

@@ -178,7 +178,7 @@ typedef struct {
 	// Nothing is drawn until R_RenderScene is called.
 	void	(*ClearScene)( void );
 	void	(*AddRefEntityToScene)( const refEntity_t *re );
-	void	(*AddPolyToScene)( qhandle_t hShader , int numVerts, const polyVert_t *verts );
+	void	(*AddPolyToScene)( qhandle_t hShader , int numVerts, const polyVert_t *verts, int numPolys );
 	void	(*AddLightToScene)( const vec3_t org, float intensity, float r, float g, float b );
 	void	(*RenderScene)( const refdef_t *fd );
 	qboolean(*GetLighting)( const vec3_t org, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir);