RTX Remix

.vimrc

@@ -3,7 +3,9 @@ set errorformat^=%f(%l):\ %m,%f(%l)\ :\ %m,%f\ :\ error\ %m,LINK\ :\ fatal\ erro
 
 map <silent> <F3> :wa <bar> let &makeprg='..\GameData\System\UCC.exe' <bar> make! make "ini=../../Code/UCC/UCC.ini" -noprompt -fullsourcepath -noincremental <bar> :cwindow<CR>
 map <silent> <F4> :wa <bar> let &makeprg='build.bat' <bar> make! debug <bar> :cwindow<CR>
-map <F5> :!start "../GameData/System/CT.exe" dm_canyon?game=mpgame.dmgame?maxplayers=32?Listen -windowed -log -nosaveconfig -rendev=opengl<CR>
+
+" map <F5> :!start "../GameData/System/CT.exe" dm_canyon?game=mpgame.dmgame?maxplayers=32?Listen -windowed -log -nosaveconfig -rendev=rtx<CR>
+map <F5> :!start "../GameData/System/CT.exe" geo_01a -windowed -log -nosaveconfig -rendev=rtx<CR>
 map <F6> :!start "../GameData/System/CTEditor.exe"<CR>
 
 augroup customhighlight

CT.sln

@@ -23,6 +23,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModEd", "ModEd\ModEd.vcproj
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtxDrv", "RtxDrv\RtxDrv.vcproj", "{D7878929-5402-468A-811D-1591523609F3}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug

CT/Src/Launcher.cpp

@@ -11,6 +11,21 @@
 
 #pragma comment(lib, "Winmm.lib") // timeBeginPeriod, timeEndPeriod
 
+// Allow short form of known render devices.
+static FStringTemp GetFullRenderDeviceClassName(const FString& RenderDeviceClass)
+{
+	if(RenderDeviceClass == "D3D")
+		return "D3DDrv.D3DRenderDevice";
+	else if(RenderDeviceClass == "OpenGL")
+		return "OpenGLDrv.OpenGLRenderDevice";
+	else if(RenderDeviceClass == "Mod")
+		return "Mod.ModRenderDevice";
+	else if(RenderDeviceClass == "Rtx")
+		return "RtxDrv.RtxRenderDevice";
+
+	return RenderDeviceClass;
+}
+
 static void EndFullscreen()
 {
 	if(GEngine && GEngine->Client && GEngine->Client->Viewports.Num() > 0 && GEngine->Client->Viewports[0])
@@ -393,18 +408,18 @@ static struct FExecHook : public FExec, FNotifyHook{
 			SetFocus(Preferences->hWnd);
 
 			return 1;
-		}
-		else if(!GIsEditor && GIsClient && ParseCommand(&Cmd, "USERENDEV"))
-		{
-			FString RenderDeviceClass = Cmd;
-
-			if(RenderDeviceClass == "D3D")
-				RenderDeviceClass = "D3DDrv.D3DRenderDevice";
-			else if(RenderDeviceClass == "OpenGL")
-				RenderDeviceClass = "OpenGLDrv.OpenGLRenderDevice";
-			else if(RenderDeviceClass == "Mod")
-				RenderDeviceClass = "Mod.ModRenderDevice";
+		}else if(GIsClient && ParseCommand(&Cmd, "GETRES")){
+			Ar.Logf("%ix%i", GEngine->Client->Viewports[0]->SizeX, GEngine->Client->Viewports[0]->SizeY);
+			return 1;
+		}else if(ParseCommand(&Cmd, "GETRENDEV")){
+			if(GEngine && GEngine->GRenDev)
+				Ar.Log(GEngine->GRenDev->GetClass()->GetPathName());
+			else
+				Ar.Logf("No render device in use");
 
+			return 1;
+		}else if(!GIsEditor && GIsClient && ParseCommand(&Cmd, "USERENDEV")){
+			FString RenderDeviceClass = GetFullRenderDeviceClassName(Cmd);
 			UClass* Class = LoadClass<URenderDevice>(NULL, *RenderDeviceClass, NULL, LOAD_NoWarn | LOAD_Quiet, NULL);
 
 			if(Class)
@@ -459,16 +474,8 @@ static void InitEngine()
 
 	FString RenderDeviceClass;
 
-	if(Parse(appCmdLine(), "RenDev=", RenderDeviceClass))
-	{
-		// Allow short form of known render devices.
-		if(RenderDeviceClass == "D3D")
-			RenderDeviceClass = "D3DDrv.D3DRenderDevice";
-		else if(RenderDeviceClass == "OpenGL")
-			RenderDeviceClass = "OpenGLDrv.OpenGLRenderDevice";
-		else if(RenderDeviceClass == "Mod")
-			RenderDeviceClass = "Mod.ModRenderDevice";
-
+	if(Parse(appCmdLine(), "RenDev=", RenderDeviceClass)){
+		RenderDeviceClass = GetFullRenderDeviceClassName(RenderDeviceClass);
 		debugf("RenderDevice set on command line: %s", *RenderDeviceClass);
 		GConfig->SetString("Engine.Engine", "RenderDevice", *RenderDeviceClass);
 		RenDevSetOnCommandLine = true;
@@ -668,7 +675,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		appPreExit();
 
 		GIsGuarded = 0;
-	}catch(...)
+	}
+	catch(...)
 	{
 		GIsGuarded = 0;
 		ExitCode = EXIT_FAILURE;

Core/Inc/UnClass.h

@@ -240,6 +240,12 @@ class CORE_API UStruct : public UField{
 	UStruct* GetSuperStruct() const;
 	bool StructCompare(const void* A, const void* B);
 
+	template<typename T>
+	bool IsChildOf()
+	{
+		return IsChildOf(T::StaticClass());
+	}
+
 protected:
 	// Cheat Protection
 	BYTE FunctionMD5Digest[16]; // Holds a MD5 digest for this function

Core/Inc/UnObjBas.h

@@ -511,7 +511,6 @@ class CORE_API UObject{
 	UBOOL IsA(FName SomeBaseClassName) const;
 	UBOOL IsIn(UObject* SomeOuter) const;
 	UBOOL IsProbing(FName ProbeName);
-	UField* FindObjectField(FName InName, UBOOL Global = 0);
 	UFunction* FindFunction(FName InName, UBOOL Global = 0);
 	UFunction* FindFunctionChecked(FName InName, UBOOL Global = 0);
 	UState* FindState(FName InName);

D3DDrv/Inc/D3DDrv.h

@@ -18,10 +18,39 @@ struct IDirect3DDevice8;
 class D3DDRV_API UD3DRenderDevice : public URenderDevice{
 	DECLARE_CLASS(UD3DRenderDevice,URenderDevice,CLASS_Config,D3DDrv);
 public:
-	char Padding1[17920];
+	char              Padding1[16412]; // Padding
+	UBOOL             UsePrecaching;
+	UBOOL             UseTrilinear;
+	INT               Padding2; // Padding
+	UBOOL             UseVSync;
+	UBOOL             UseHardwareTL;
+	UBOOL             UseHardwareVS;
+	UBOOL             UseCubemaps;
+	char              PADDING3[16]; // Padding
+	UBOOL             UseTripleBuffering;
+	UBOOL             ReduceMouseLag;
+	UBOOL             UseXBoxFSAA;
+	char              Padding4[16]; // Padding
+	UBOOL             CheckForOverflow;
+	UBOOL             UseNPatches;
+	UBOOL             DecompressTextures;
+	UBOOL             AvoidHitches;
+	UBOOL             OverrideDesktopRefreshRate;
+	INT               Padding5; // Padding
+	INT               AdapterNumber;
+	INT               Padding6; // Padding
+	INT               MaxPixelShaderVersion;
+	INT               LevelOfAnisotropy;
+	FLOAT             DetailTexMipBias;
+	FLOAT             DefaultTexMipBias;
+	FLOAT             TesselationFactor;
+	FLOAT             DesiredRefreshRate;
+	INT               VideoResetAttempts;
+	UBOOL             StateCachingDisabled;
+	char              Padding7[1370]; // Padding
 	IDirect3D8*       Direct3D8;
 	IDirect3DDevice8* Direct3DDevice8;
-	char Padding2[47868];
+	char              Padding8[47868]; // Padding
 
 	//Overrides
 	virtual UBOOL Exec(const TCHAR* Cmd, FOutputDevice& Ar);

Engine/Inc/EngineClasses.h

@@ -5968,6 +5968,105 @@ class ENGINE_API UHardwareShaderWrapper : public URenderedMaterial{
 	}
 };
 
+/*
+ * HsBumpDiffBlend
+ */
+
+class ENGINE_API UHsBumpDiffBlend : public UHardwareShaderWrapper{
+public:
+	class UTexture* DiffuseTexture;
+	class UTexture* BlendTexture;
+	class UTexture* NormalMap;
+	FLOAT DiffUVScale;
+	FLOAT BlendUVScale;
+	FLOAT BumpUVScale;
+
+	DECLARE_CLASS(UHsBumpDiffBlend,UHardwareShaderWrapper,0,Engine)
+	// Make sure to implement this function in UnHardwareShaderWrapper.cpp
+	virtual INT SetupShaderWrapper(class FRenderInterface* RI);
+};
+
+/*
+ * HsBumpDiffBlendMask
+ */
+
+class ENGINE_API UHsBumpDiffBlendMask : public UHardwareShaderWrapper{
+public:
+	class UTexture* DiffuseTexture;
+	class UTexture* BlendTexture;
+	class UTexture* NormalMap;
+	FLOAT DiffUVScale;
+	FLOAT BlendUVScale;
+	FLOAT BumpUVScale;
+	BYTE VertexToTextureBlend;
+
+	DECLARE_CLASS(UHsBumpDiffBlendMask,UHardwareShaderWrapper,0,Engine)
+	// Make sure to implement this function in UnHardwareShaderWrapper.cpp
+	virtual INT SetupShaderWrapper(class FRenderInterface* RI);
+};
+
+/*
+ * HsBumpDiffBlendMaskIllum
+ */
+
+class ENGINE_API UHsBumpDiffBlendMaskIllum : public UHardwareShaderWrapper{
+public:
+	class UTexture* DiffuseTexture;
+	class UTexture* BlendTexture;
+	class UTexture* NormalMap;
+	FLOAT DiffUVScale;
+	FLOAT BlendUVScale;
+	FLOAT BumpUVScale;
+	BYTE VertexToTextureBlend;
+
+	DECLARE_CLASS(UHsBumpDiffBlendMaskIllum,UHardwareShaderWrapper,0,Engine)
+	// Make sure to implement this function in UnHardwareShaderWrapper.cpp
+	virtual INT SetupShaderWrapper(class FRenderInterface* RI);
+};
+
+/*
+ * HsBumpDiffSpec
+ */
+
+class ENGINE_API UHsBumpDiffSpec : public UHardwareShaderWrapper{
+public:
+	class UTexture* DiffuseTexture;
+	class UTexture* NormalMap;
+	FLOAT DiffUVScale;
+	FLOAT BumpUVScale;
+	BYTE Specularity;
+	FColor SpecularTint;
+
+	DECLARE_CLASS(UHsBumpDiffSpec,UHardwareShaderWrapper,0,Engine)
+	// Make sure to implement this function in UnHardwareShaderWrapper.cpp
+	virtual INT SetupShaderWrapper(class FRenderInterface* RI);
+};
+
+/*
+ * HsFalloff
+ */
+
+class ENGINE_API UHsFalloff : public UHardwareShaderWrapper{
+public:
+	class UTexture* DiffuseTexture;
+	class UTexture* FalloffGradient;
+	FLOAT UPanRate;
+	FLOAT VPanRate;
+	FLOAT UOscilationRate;
+	FLOAT VOscilationRate;
+	FLOAT GradientBlendMode;
+	FColor DiffuseTint;
+	FColor GradientTint;
+	BYTE SrcBlend;
+	BYTE DestBlend;
+	BITFIELD ZTest:1;
+	BITFIELD ZWrite:1;
+
+	DECLARE_CLASS(UHsFalloff,UHardwareShaderWrapper,0,Engine)
+	// Make sure to implement this function in UnHardwareShaderWrapper.cpp
+	virtual INT SetupShaderWrapper(class FRenderInterface* RI);
+};
+
 /*
  * HsHologram
  */
@@ -5983,6 +6082,26 @@ class ENGINE_API UHsHologram : public UHardwareShaderWrapper{
 	virtual INT SetupShaderWrapper(class FRenderInterface* RI);
 };
 
+/*
+ * HsWorldDistortion
+ */
+
+class ENGINE_API UHsWorldDistortion : public UHardwareShaderWrapper{
+public:
+	FColor ColorAdd;
+	FColor ColorVariation;
+	float WorldDistortion;
+	FLOAT WobbleScale;
+	FLOAT WobbleSpeed;
+	FLOAT WobbleAmplitute;
+	BITFIELD VortexEffect:1;
+	BYTE Alpha;
+
+	DECLARE_CLASS(UHsWorldDistortion,UHardwareShaderWrapper,0,Engine)
+	// Make sure to implement this function in UnHardwareShaderWrapper.cpp
+	virtual INT SetupShaderWrapper(class FRenderInterface* RI);
+};
+
 /*
  * ParticleMaterial
  */

Engine/Inc/UnRender.h

@@ -137,7 +137,7 @@ class ENGINE_API FLevelSceneNode : public FSceneNode{
 	// Virtual functions
 	virtual FConvexVolume GetViewFrustum();
 	virtual UBOOL FilterActor(AActor* Actor);
-    virtual UBOOL FilterAttachment(AActor* AttachedActor){ return 1; }
+	virtual UBOOL FilterAttachment(AActor* AttachedActor){ return 1; }
 	virtual UBOOL FilterProjector(AProjector* Actor);
 };
 

Mod/PropertyOverrides/CTInventory.BattleDroidBlasterProj.txt

@@ -0,0 +1,2 @@
+LightHue=255
+LightSaturation=40

Mod/PropertyOverrides/CTInventory.DC17BlasterProj.txt

@@ -0,0 +1,2 @@
+LightHue=170
+LightSaturation=40

Mod/PropertyOverrides/Properties.BattleDroidBlasterProjTM.txt

@@ -0,0 +1,2 @@
+LightHue=255
+LightSaturation=40

ModEd/Src/ModEd.cpp

@@ -72,6 +72,33 @@ static WWindow* GetMainWindow()
 	return *reinterpret_cast<WWindow**>(0x10FE39D4);
 }
 
+static WNDPROC OriginalMainWindowProc = NULL;
+
+LRESULT CALLBACK MainWindowProcOverride(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+{
+	if(Msg == WM_INPUT)
+	{
+		RAWINPUT RawInput;
+		UINT RawInputSize = sizeof(RawInput);
+
+		if(GET_RAWINPUT_CODE_WPARAM(wParam) != RIM_INPUT)
+			return 0;
+
+		if(GetRawInputData((HRAWINPUT)(lParam), RID_INPUT, &RawInput, &RawInputSize, sizeof(RAWINPUTHEADER)) != (UINT)-1)
+		{
+			if(RawInput.header.dwType == RIM_TYPEMOUSE)
+			{
+
+			}
+		}
+
+		DefWindowProcA(hWnd, Msg, wParam, lParam);
+		return 0;
+	}
+
+	return OriginalMainWindowProc(hWnd, Msg, wParam, lParam);
+}
+
 static void(__fastcall*OriginalUUnrealEdEngineTick)(UEditorEngine*, DWORD, FLOAT) = NULL;
 
 /*
@@ -113,6 +140,22 @@ static void __fastcall UnrealEdEngineTickOverride(UEditorEngine* Self, DWORD Edx
 		SendMessageA(GetMainWindow()->hWnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
 	}
 
+	OriginalMainWindowProc = reinterpret_cast<WNDPROC>(GetWindowLongA(GetMainWindow()->hWnd, GWLP_WNDPROC));
+	SetWindowLongA(GetMainWindow()->hWnd, GWLP_WNDPROC, reinterpret_cast<LONG>(MainWindowProcOverride));
+
+#ifndef HID_USAGE_PAGE_GENERIC
+#define HID_USAGE_PAGE_GENERIC  ((USHORT)0x01)
+#define HID_USAGE_GENERIC_MOUSE ((USHORT)0x02)
+#endif
+
+	RAWINPUTDEVICE RawInput;
+	RawInput.usUsagePage = HID_USAGE_PAGE_GENERIC;
+	RawInput.usUsage     = HID_USAGE_GENERIC_MOUSE;
+	RawInput.dwFlags     = 0;
+	RawInput.hwndTarget  = GetMainWindow()->hWnd;
+
+	RegisterRawInputDevices(&RawInput, 1, sizeof(RAWINPUTDEVICE));
+
 	// Restore original tick function now that the initial setup is done.
 	PatchVTable(Self, 32, OriginalUUnrealEdEngineTick);
 }
@@ -168,5 +211,6 @@ DLL_EXPORT void ModEdInit(const TCHAR* InPackage, const TCHAR* InCmdLine, FOutpu
 
 	InitSWRCFix();
 
+	// Hook UUnrealEdEngine::Tick for initialization
 	OriginalUUnrealEdEngineTick = static_cast<void(__fastcall*)(UEditorEngine*, DWORD, FLOAT)>(PatchDllClassVTable(*(FString(appPackage()) + ".exe"), "UUnrealEdEngine", "UObject", 32, UnrealEdEngineTickOverride));
 }