Merge remote-tracking branch 'upstream/lcs' into lcs

src/core/Camera.cpp

@@ -3864,7 +3864,7 @@ CCamera::GetScreenFadeStatus(void)
 }
 
 
-
+//--LCS: TODO
 void
 CCamera::RenderMotionBlur(void)
 {
@@ -3873,7 +3873,8 @@ CCamera::RenderMotionBlur(void)
 
 	CMBlur::MotionBlurRender(m_pRwCamera,
 		m_BlurRed, m_BlurGreen, m_BlurBlue,
-		m_motionBlur, m_BlurType, m_imotionBlurAddAlpha);
+//		m_motionBlur, m_BlurType, m_imotionBlurAddAlpha);
+		m_motionBlur, m_BlurType, 32);	// hack hack
 }
 
 void

src/core/Frontend.cpp

@@ -65,7 +65,7 @@ const CRGBA SCROLLBAR_COLOR = LABEL_COLOR;
 #define MIN_BRIGHTNESS 180
 #define MAX_BRIGHTNESS 700
 #else
-// PS2
+// PS2, also PSP probably
 // 8 bars (32 step)
 #define DEFAULT_BRIGHTNESS 0x120
 #define MIN_BRIGHTNESS 0x80

src/core/re3.cpp

@@ -87,19 +87,21 @@ CustomFrontendOptionsPopulate(void)
 
 	// These work only if we have neo folder, so they're dynamically added
 #ifdef EXTENDED_PIPELINES
-	const char *vehPipelineNames[] = { "FED_MFX", "FED_NEO" };
+	const char *pipelineNames[] = { "FED_PSP", "FED_PS2","FED_MOB" };
 	const char *off_on[] = { "FEM_OFF", "FEM_ON" };
 	int fd = CFileMgr::OpenFile("neo/neo.txd","r");
 	if (fd) {
 #ifdef GRAPHICS_MENU_OPTIONS
 		FrontendOptionSetCursor(MENUPAGE_GRAPHICS_SETTINGS, -3, false);
-		FrontendOptionAddSelect("FED_VPL", 0, 0, MENUALIGN_LEFT, vehPipelineNames, ARRAY_SIZE(vehPipelineNames), (int8*)&CustomPipes::VehiclePipeSwitch, false, nil, "VehiclePipeline");
+		FrontendOptionAddSelect("FED_VPL", 0, 0, MENUALIGN_LEFT, pipelineNames, ARRAY_SIZE(pipelineNames), (int8*)&CustomPipes::VehiclePipeSwitch, false, nil, "VehiclePipeline");
+		FrontendOptionAddSelect("FED_WPL", 0, 0, MENUALIGN_LEFT, pipelineNames, ARRAY_SIZE(pipelineNames), (int8*)&CustomPipes::WorldPipeSwitch, false, nil, "WorldPipeline");
 		FrontendOptionAddSelect("FED_PRM", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::RimlightEnable, false, nil, "NeoRimLight");
 		FrontendOptionAddSelect("FED_WLM", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::LightmapEnable, false, nil, "NeoLightMaps");
 		FrontendOptionAddSelect("FED_RGL", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::GlossEnable, false, nil, "NeoRoadGloss");
 #else
 		FrontendOptionSetCursor(MENUPAGE_DISPLAY_SETTINGS, -3, false);
-		FrontendOptionAddSelect("FED_VPL", 0, 0, MENUALIGN_LEFT, vehPipelineNames, ARRAY_SIZE(vehPipelineNames), (int8*)&CustomPipes::VehiclePipeSwitch, false, nil, "VehiclePipeline");
+		FrontendOptionAddSelect("FED_VPL", 0, 0, MENUALIGN_LEFT, pipelineNames, ARRAY_SIZE(pipelineNames), (int8*)&CustomPipes::VehiclePipeSwitch, false, nil, "VehiclePipeline");
+		FrontendOptionAddSelect("FED_WPL", 0, 0, MENUALIGN_LEFT, pipelineNames, ARRAY_SIZE(pipelineNames), (int8*)&CustomPipes::WorldPipeSwitch, false, nil, "WorldPipeline");
 		FrontendOptionAddSelect("FED_PRM", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::RimlightEnable, false, nil, "NeoRimLight");
 		FrontendOptionAddSelect("FED_WLM", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::LightmapEnable, false, nil, "NeoLightMaps");
 		FrontendOptionAddSelect("FED_RGL", 0, 0, MENUALIGN_LEFT, off_on, 2, (int8*)&CustomPipes::GlossEnable, false, nil, "NeoRoadGloss");
@@ -649,8 +651,8 @@ extern bool gbRenderWorld2;
 #endif
 
 #ifdef EXTENDED_COLOURFILTER
-		static const char *filternames[] = { "None", "PS2" };
+		static const char *filternames[] = { "None", "PSP", "PS2" };
-		e = DebugMenuAddVar("Render", "Colourfilter", &CPostFX::EffectSwitch, nil, 1, CPostFX::POSTFX_OFF, CPostFX::POSTFX_NORMAL, filternames);
+		e = DebugMenuAddVar("Render", "Colourfilter", &CPostFX::EffectSwitch, nil, 1, CPostFX::POSTFX_OFF, CPostFX::POSTFX_PS2, filternames);
 		DebugMenuEntrySetWrap(e, true);
 		DebugMenuAddVar("Render", "Intensity", &CPostFX::Intensity, nil, 0.05f, 0, 10.0f);
 		DebugMenuAddVarBool8("Render", "Blur", &CPostFX::BlurOn, nil);
@@ -661,13 +663,13 @@ extern bool gbRenderWorld2;
 		DebugMenuAddVarBool8("Render", "Occlusion debug", &bDispayOccDebugStuff, nil);
 #endif
 #ifdef EXTENDED_PIPELINES
-		static const char *worldpipenames[] = { "PS2", "Mobile" };
+		static const char *worldpipenames[] = { "PSP", "PS2", "Mobile" };
 		e = DebugMenuAddVar("Render", "World Rendering", &CustomPipes::WorldPipeSwitch, nil,
-			1, CustomPipes::WORLDPIPE_PS2, CustomPipes::WORLDPIPE_MOBILE, worldpipenames);
+			1, CustomPipes::WORLDPIPE_PSP, CustomPipes::WORLDPIPE_MOBILE, worldpipenames);
 		DebugMenuEntrySetWrap(e, true);
-		static const char *vehpipenames[] = { "PS2", "Mobile", "Neo" };
+		static const char *vehpipenames[] = { "PSP", "PS2", "Mobile" };
 		e = DebugMenuAddVar("Render", "Vehicle Pipeline", &CustomPipes::VehiclePipeSwitch, nil,
-			1, CustomPipes::VEHICLEPIPE_PS2, CustomPipes::VEHICLEPIPE_MOBILE, vehpipenames);
+			1, CustomPipes::VEHICLEPIPE_PSP, CustomPipes::VEHICLEPIPE_MOBILE, vehpipenames);
 		DebugMenuEntrySetWrap(e, true);
 		DebugMenuAddVarBool8("Render", "Glass Cars cheat", &CustomPipes::gGlassCarsCheat, nil);
 extern bool gbRenderDebugEnvMap;

src/extras/custompipes.h

@@ -86,6 +86,7 @@ extern int16 QuadIndices[6];
 void EnvMapRender(void);
 
 enum {
+	VEHICLEPIPE_PSP,
 	VEHICLEPIPE_PS2,
 	VEHICLEPIPE_MOBILE,
 
@@ -106,6 +107,7 @@ void AttachVehiclePipe(rw::Atomic *atomic);
 void AttachVehiclePipe(rw::Clump *clump);
 
 enum {
+	WORLDPIPE_PSP,
 	WORLDPIPE_PS2,
 	WORLDPIPE_MOBILE
 };

src/extras/custompipes_d3d9.cpp

@@ -45,12 +45,11 @@ enum {
 	VSLOC_ambient,
 	VSLOC_viewMat,	// only vehicle
 
-	PSLOC_colorscale = 1,
-
 	// Leeds vehicle PS2
 	VSLOC_texMat = rw::d3d::VSLOC_afterLights,
 
-	PSLOC_shininess = 1,
+	PSLOC_colorscale = 1,
+	PSLOC_shininess,
 	PSLOC_skyTop,
 	PSLOC_skyBot
 };
@@ -124,6 +123,9 @@ leedsVehicleRenderCB(rw::Atomic *atomic, rw::d3d9::InstanceDataHeader *header)
 
 	SetRenderState(SRCBLEND, BLENDONE);
 
+	float colorscale[4];
+	colorscale[3] = 1.0f;
+
 	InstanceData *inst = header->inst;
 	for(rw::uint32 i = 0; i < header->numMeshes; i++){
 		Material *m = inst->material;
@@ -140,6 +142,13 @@ leedsVehicleRenderCB(rw::Atomic *atomic, rw::d3d9::InstanceDataHeader *header)
 
 		setMaterial(m->color, m->surfaceProps);
 
+		float cs = 1.0f;
+		// how does the PS2 handle this actually? probably scaled material color?
+		if(VehiclePipeSwitch == VEHICLEPIPE_PSP && m->texture)
+			cs = 2.0f;
+		colorscale[0] = colorscale[1] = colorscale[2] = cs;
+		d3ddevice->SetPixelShaderConstantF(PSLOC_colorscale, colorscale, 1);
+
 		if(m->texture)
 			d3d::setTexture(0, m->texture);
 		else
@@ -154,6 +163,24 @@ leedsVehicleRenderCB(rw::Atomic *atomic, rw::d3d9::InstanceDataHeader *header)
 	SetRenderState(SRCBLEND, BLENDSRCALPHA);
 }
 
+void
+uploadWorldLights(void)
+{
+	using namespace rw;
+	using namespace rw::d3d;
+	using namespace rw::d3d9;
+
+	RGBAf amb, emiss;
+	amb.red = CTimeCycle::GetAmbientRed();
+	amb.green = CTimeCycle::GetAmbientGreen();
+	amb.blue = CTimeCycle::GetAmbientBlue();
+	amb.alpha = 1.0f;
+	emiss = pAmbient->color;
+
+	d3ddevice->SetVertexShaderConstantF(VSLOC_ambient, (float*)&amb, 1);
+	d3ddevice->SetVertexShaderConstantF(VSLOC_emissive, (float*)&emiss, 1);
+}
+
 void
 leedsVehicleRenderCB_mobile(rw::Atomic *atomic, rw::d3d9::InstanceDataHeader *header)
 {
@@ -172,15 +199,7 @@ leedsVehicleRenderCB_mobile(rw::Atomic *atomic, rw::d3d9::InstanceDataHeader *he
 	setVertexShader(leedsVehicle_mobile_VS);
 	setPixelShader(leedsVehicle_mobile_PS);
 
-	RGBAf amb, emiss;
+	uploadWorldLights();
-	amb.red = CTimeCycle::GetAmbientRed();
-	amb.green = CTimeCycle::GetAmbientGreen();
-	amb.blue = CTimeCycle::GetAmbientBlue();
-	amb.alpha = 1.0f;
-	emiss = pAmbient->color;
-
-	d3ddevice->SetVertexShaderConstantF(VSLOC_ambient, (float*)&amb, 1);
-	d3ddevice->SetVertexShaderConstantF(VSLOC_emissive, (float*)&emiss, 1);
 
 	RGBAf skyTop, skyBot;
 	skyTop.red = CTimeCycle::GetSkyTopRed()/255.0f;
@@ -265,7 +284,7 @@ vehicleRenderCB(rw::Atomic *atomic, rw::d3d9::InstanceDataHeader *header)
 	using namespace rw::d3d9;
 
 	// TODO: make this less of a kludge
-	if(VehiclePipeSwitch == VEHICLEPIPE_PS2){
+	if(VehiclePipeSwitch == VEHICLEPIPE_PSP || VehiclePipeSwitch == VEHICLEPIPE_PS2){
 		leedsVehicleRenderCB(atomic, header);
 	//	matFXGlobals.pipelines[rw::platform]->render(atomic);
 		return;
@@ -337,31 +356,31 @@ CreateVehiclePipe(void)
 //		fp = ReadTweakValueTable(fp, SpecColor);
 //	}
 
-#include "shaders/neoVehicle_VS.inc"
+#include "shaders/obj/neoVehicle_VS.inc"
 	neoVehicle_VS = rw::d3d::createVertexShader(neoVehicle_VS_cso);
 	assert(neoVehicle_VS);
 
-#include "shaders/neoVehicle_PS.inc"
+#include "shaders/obj/neoVehicle_PS.inc"
 	neoVehicle_PS = rw::d3d::createPixelShader(neoVehicle_PS_cso);
 	assert(neoVehicle_PS);
 
-#include "shaders/leedsVehicle_VS.inc"
+#include "shaders/obj/leedsDefault_ENV_VS.inc"
-	leedsVehicle_VS = rw::d3d::createVertexShader(leedsVehicle_VS_cso);
+	leedsVehicle_VS = rw::d3d::createVertexShader(leedsDefault_ENV_VS_cso);
 	assert(leedsVehicle_VS);
 
-#include "shaders/leedsVehicle_mobile_VS.inc"
+#include "shaders/obj/leedsVehicle_mobile_VS.inc"
 	leedsVehicle_mobile_VS = rw::d3d::createVertexShader(leedsVehicle_mobile_VS_cso);
 	assert(leedsVehicle_mobile_VS);
 
-#include "shaders/leedsVehicle_blend_PS.inc"
+#include "shaders/obj/leedsDefault_BLEND_PS.inc"
-	leedsVehicle_blend_PS = rw::d3d::createPixelShader(leedsVehicle_blend_PS_cso);
+	leedsVehicle_blend_PS = rw::d3d::createPixelShader(leedsDefault_BLEND_PS_cso);
 	assert(leedsVehicle_blend_PS);
 
-#include "shaders/leedsVehicle_add_PS.inc"
+#include "shaders/obj/leedsDefault_ADD_PS.inc"
-	leedsVehicle_add_PS = rw::d3d::createPixelShader(leedsVehicle_add_PS_cso);
+	leedsVehicle_add_PS = rw::d3d::createPixelShader(leedsDefault_ADD_PS_cso);
 	assert(leedsVehicle_add_PS);
 
-#include "shaders/leedsVehicle_mobile_PS.inc"
+#include "shaders/obj/leedsVehicle_mobile_PS.inc"
 	leedsVehicle_mobile_PS = rw::d3d::createPixelShader(leedsVehicle_mobile_PS_cso);
 	assert(leedsVehicle_mobile_PS);
 
@@ -424,15 +443,7 @@ worldRenderCB(rw::Atomic *atomic, rw::d3d9::InstanceDataHeader *header)
 
 	uploadMatrices(atomic->getFrame()->getLTM());
 
-	RGBAf amb, emiss;
+	uploadWorldLights();
-	amb.red = CTimeCycle::GetAmbientRed();
-	amb.green = CTimeCycle::GetAmbientGreen();
-	amb.blue = CTimeCycle::GetAmbientBlue();
-	amb.alpha = 1.0f;
-	emiss = pAmbient->color;
-
-	d3ddevice->SetVertexShaderConstantF(VSLOC_ambient, (float*)&amb, 1);
-	d3ddevice->SetVertexShaderConstantF(VSLOC_emissive, (float*)&emiss, 1);
 
 	float colorscale[4];
 	colorscale[3] = 1.0f;
@@ -442,7 +453,7 @@ worldRenderCB(rw::Atomic *atomic, rw::d3d9::InstanceDataHeader *header)
 		Material *m = inst->material;
 
 		float cs = 1.0f;
-		if(WorldPipeSwitch == WORLDPIPE_PS2 && m->texture)
+		if(WorldPipeSwitch != WORLDPIPE_MOBILE && m->texture)
 			cs = 255/128.0f;
 		colorscale[0] = colorscale[1] = colorscale[2] = cs;
 		d3ddevice->SetPixelShaderConstantF(PSLOC_colorscale, colorscale, 1);
@@ -469,13 +480,13 @@ CreateWorldPipe(void)
 //	else
 //		ReadTweakValueTable((char*)work_buff, WorldLightmapBlend);
 
-#include "shaders/leedsBuilding_VS.inc"
+#include "shaders/obj/leedsBuilding_VS.inc"
 	leedsBuilding_VS = rw::d3d::createVertexShader(leedsBuilding_VS_cso);
 	assert(leedsBuilding_VS);
-#include "shaders/leedsBuilding_mobile_VS.inc"
+#include "shaders/obj/leedsBuilding_mobile_VS.inc"
 	leedsBuilding_mobile_VS = rw::d3d::createVertexShader(leedsBuilding_mobile_VS_cso);
 	assert(leedsBuilding_mobile_VS);
-#include "shaders/scale_PS.inc"
+#include "shaders/obj/scale_PS.inc"
 	scale_PS = rw::d3d::createPixelShader(scale_PS_cso);
 	assert(scale_PS);
 
@@ -559,11 +570,11 @@ glossRenderCB(rw::Atomic *atomic, rw::d3d9::InstanceDataHeader *header)
 void
 CreateGlossPipe(void)
 {
-#include "shaders/neoGloss_VS.inc"
+#include "shaders/obj/neoGloss_VS.inc"
 	neoGloss_VS = rw::d3d::createVertexShader(neoGloss_VS_cso);
 	assert(neoGloss_VS);
 
-#include "shaders/neoGloss_PS.inc"
+#include "shaders/obj/neoGloss_PS.inc"
 	neoGloss_PS = rw::d3d::createPixelShader(neoGloss_PS_cso);
 	assert(neoGloss_PS);
 
@@ -725,11 +736,11 @@ CreateRimLightPipes(void)
 	}
 
 
-#include "shaders/neoRim_VS.inc"
+#include "shaders/obj/neoRim_VS.inc"
 	neoRim_VS = rw::d3d::createVertexShader(neoRim_VS_cso);
 	assert(neoRim_VS);
 
-#include "shaders/neoRimSkin_VS.inc"
+#include "shaders/obj/neoRimSkin_VS.inc"
 	neoRimSkin_VS = rw::d3d::createVertexShader(neoRimSkin_VS_cso);
 	assert(neoRimSkin_VS);
 
@@ -850,15 +861,7 @@ AtomicFirstPass(RpAtomic *atomic, int pass)
 			setPixelShader(CustomPipes::scale_PS);
 			d3ddevice->SetVertexShaderConstantF(VSLOC_combined, (float*)&building->combinedMat, 4);
 
-			RGBAf amb, emiss;
+			CustomPipes::uploadWorldLights();
-			amb.red = CTimeCycle::GetAmbientRed();
-			amb.green = CTimeCycle::GetAmbientGreen();
-			amb.blue = CTimeCycle::GetAmbientBlue();
-			amb.alpha = 1.0f;
-			emiss = pAmbient->color;
-
-			d3ddevice->SetVertexShaderConstantF(CustomPipes::VSLOC_ambient, (float*)&amb, 1);
-			d3ddevice->SetVertexShaderConstantF(CustomPipes::VSLOC_emissive, (float*)&emiss, 1);
 
 			colorscale[3] = 1.0f;
 
@@ -866,14 +869,14 @@ AtomicFirstPass(RpAtomic *atomic, int pass)
 		}
 
 		float cs = 1.0f;
-		if(CustomPipes::WorldPipeSwitch == CustomPipes::WORLDPIPE_PS2 && m->texture)
+		if(CustomPipes::WorldPipeSwitch != CustomPipes::WORLDPIPE_MOBILE && m->texture)
 			cs = 255/128.0f;
 		colorscale[0] = colorscale[1] = colorscale[2] = cs;
 		d3ddevice->SetPixelShaderConstantF(CustomPipes::PSLOC_colorscale, colorscale, 1);
 
 		d3d::setTexture(0, m->texture);
 
-		setMaterial(m->color, m->surfaceProps, 0.5f);
+		setMaterial(m->color, m->surfaceProps, CustomPipes::WorldPipeSwitch == CustomPipes::WORLDPIPE_PS2 ? 0.5f : 1.0f);
 
 		drawInst(building->instHeader, inst);
 	}
@@ -913,15 +916,7 @@ RenderBlendPass(int pass)
 		setVertexShader(CustomPipes::leedsBuilding_VS);
 	setPixelShader(CustomPipes::scale_PS);
 
-	RGBAf amb, emiss;
+	CustomPipes::uploadWorldLights();
-	amb.red = CTimeCycle::GetAmbientRed();
-	amb.green = CTimeCycle::GetAmbientGreen();
-	amb.blue = CTimeCycle::GetAmbientBlue();
-	amb.alpha = 1.0f;
-	emiss = pAmbient->color;
-
-	d3ddevice->SetVertexShaderConstantF(CustomPipes::VSLOC_ambient, (float*)&amb, 1);
-	d3ddevice->SetVertexShaderConstantF(CustomPipes::VSLOC_emissive, (float*)&emiss, 1);
 
 	float colorscale[4];
 	colorscale[3] = 1.0f;
@@ -944,7 +939,7 @@ RenderBlendPass(int pass)
 				continue;	// already done this one
 
 			float cs = 1.0f;
-			if(CustomPipes::WorldPipeSwitch == CustomPipes::WORLDPIPE_PS2 && m->texture)
+			if(CustomPipes::WorldPipeSwitch != CustomPipes::WORLDPIPE_MOBILE && m->texture)
 				cs = 255/128.0f;
 			colorscale[0] = colorscale[1] = colorscale[2] = cs;
 			d3ddevice->SetPixelShaderConstantF(CustomPipes::PSLOC_colorscale, colorscale, 1);
@@ -953,7 +948,7 @@ RenderBlendPass(int pass)
 
 			rw::RGBA color = m->color;
 			color.alpha = (color.alpha * building->fadeAlpha)/255;
-			setMaterial(color, m->surfaceProps, 0.5f);
+			setMaterial(color, m->surfaceProps, CustomPipes::WorldPipeSwitch == CustomPipes::WORLDPIPE_PS2 ? 0.5f : 1.0f);
 
 			drawInst(building->instHeader, inst);
 		}

src/extras/custompipes_gl.cpp

@@ -132,6 +132,9 @@ leedsVehicleRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 
 	SetRenderState(SRCBLEND, BLENDONE);
 
+	float colorscale[4];
+	colorscale[3] = 1.0f;
+
 	while(n--){
 		m = inst->material;
 
@@ -147,6 +150,13 @@ leedsVehicleRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 
 		setMaterial(m->color, m->surfaceProps);
 
+		float cs = 1.0f;
+		// how does the PS2 handle this actually? probably scaled material color?
+		if(VehiclePipeSwitch == VEHICLEPIPE_PSP && m->texture)
+			cs = 2.0f;
+		colorscale[0] = colorscale[1] = colorscale[2] = cs;
+		glUniform4fv(U(u_colorscale), 1, colorscale);
+
 		setTexture(0, m->texture);
 
 		drawInst(header, inst);
@@ -162,6 +172,23 @@ leedsVehicleRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 #endif
 }
 
+void
+uploadWorldLights(void)
+{
+	using namespace rw;
+	using namespace rw::gl3;
+
+	RGBAf amb, emiss;
+	amb.red = CTimeCycle::GetAmbientRed();
+	amb.green = CTimeCycle::GetAmbientGreen();
+	amb.blue = CTimeCycle::GetAmbientBlue();
+	amb.alpha = 1.0f;
+	emiss = pAmbient->color;
+
+	glUniform4fv(U(CustomPipes::u_amb), 1, (float*)&amb);
+	glUniform4fv(U(CustomPipes::u_emiss), 1, (float*)&emiss);
+}
+
 static void
 leedsVehicleRenderCB_mobile(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 {
@@ -186,15 +213,7 @@ leedsVehicleRenderCB_mobile(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *hea
 
 	leedsVehicleShader_mobile->use();
 
-	RGBAf amb, emiss;
+	uploadWorldLights();
-	amb.red = CTimeCycle::GetAmbientRed();
-	amb.green = CTimeCycle::GetAmbientGreen();
-	amb.blue = CTimeCycle::GetAmbientBlue();
-	amb.alpha = 1.0f;
-	emiss = pAmbient->color;
-
-	glUniform4fv(U(u_amb), 1, (float*)&amb);
-	glUniform4fv(U(u_emiss), 1, (float*)&emiss);
 
 	RGBAf skyTop, skyBot;
 	skyTop.red = CTimeCycle::GetSkyTopRed()/255.0f;
@@ -276,7 +295,7 @@ vehicleRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 	using namespace rw::gl3;
 
 	// TODO: make this less of a kludge
-	if(VehiclePipeSwitch == VEHICLEPIPE_PS2){
+	if(VehiclePipeSwitch == VEHICLEPIPE_PSP || VehiclePipeSwitch == VEHICLEPIPE_PS2){
 		leedsVehicleRenderCB(atomic, header);
 //		matFXGlobals.pipelines[rw::platform]->render(atomic);
 		return;
@@ -361,8 +380,8 @@ CreateVehiclePipe(void)
 
 
 	{
-#include "shaders/neoVehicle_fs_gl.inc"
+#include "shaders/obj/neoVehicle_frag.inc"
-#include "shaders/neoVehicle_vs_gl.inc"
+#include "shaders/obj/neoVehicle_vert.inc"
 	const char *vs[] = { shaderDecl, header_vert_src, neoVehicle_vert_src, nil };
 	const char *fs[] = { shaderDecl, header_frag_src, neoVehicle_frag_src, nil };
 	neoVehicleShader = Shader::create(vs, fs);
@@ -370,12 +389,11 @@ CreateVehiclePipe(void)
 	}
 
 	{
-#include "shaders/leedsVehicle_add_gl.inc"
+#include "shaders/obj/leedsDefault_vert.inc"
-#include "shaders/leedsVehicle_blend_gl.inc"
+#include "shaders/obj/leedsDefault_frag.inc"
-#include "shaders/leedsVehicle_vs_gl.inc"
+	const char *vs[] = { shaderDecl, header_vert_src, "#define ENVMAP\n", leedsDefault_vert_src, nil };
-	const char *vs[] = { shaderDecl, header_vert_src, leedsVehicle_vert_src, nil };
+	const char *fs_add[] = { shaderDecl, header_frag_src, "#define PASS_ADD\n", leedsDefault_frag_src, nil };
-	const char *fs_add[] = { shaderDecl, header_frag_src, leedsVehicle_add_frag_src, nil };
+	const char *fs_blend[] = { shaderDecl, header_frag_src, "#define PASS_BLEND\n", leedsDefault_frag_src, nil };
-	const char *fs_blend[] = { shaderDecl, header_frag_src, leedsVehicle_blend_frag_src, nil };
 	leedsVehicleShader_add = Shader::create(vs, fs_add);
 	assert(leedsVehicleShader_add);
 	leedsVehicleShader_blend = Shader::create(vs, fs_blend);
@@ -383,8 +401,8 @@ CreateVehiclePipe(void)
 	}
 
 	{
-#include "shaders/leedsVehicle_mobile_fs_gl.inc"
+#include "shaders/obj/leedsVehicle_mobile_frag.inc"
-#include "shaders/leedsVehicle_mobile_vs_gl.inc"
+#include "shaders/obj/leedsVehicle_mobile_vert.inc"
 	const char *vs[] = { shaderDecl, header_vert_src, leedsVehicle_mobile_vert_src, nil };
 	const char *fs[] = { shaderDecl, header_frag_src, leedsVehicle_mobile_frag_src, nil };
 	leedsVehicleShader_mobile = Shader::create(vs, fs);
@@ -453,15 +471,7 @@ worldRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 	else
 		CustomPipes::leedsWorldShader->use();
 
-	RGBAf amb, emiss;
+	uploadWorldLights();
-	amb.red = CTimeCycle::GetAmbientRed();
-	amb.green = CTimeCycle::GetAmbientGreen();
-	amb.blue = CTimeCycle::GetAmbientBlue();
-	amb.alpha = 1.0f;
-	emiss = pAmbient->color;
-
-	glUniform4fv(U(u_amb), 1, (float*)&amb);
-	glUniform4fv(U(u_emiss), 1, (float*)&emiss);
 
 	float colorscale[4];
 	colorscale[3] = 1.0f;
@@ -470,14 +480,14 @@ worldRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 		m = inst->material;
 
 		float cs = 1.0f;
-		if(WorldPipeSwitch == WORLDPIPE_PS2 && m->texture)
+		if(WorldPipeSwitch != WORLDPIPE_MOBILE && m->texture)
 			cs = 255/128.0f;
 		colorscale[0] = colorscale[1] = colorscale[2] = cs;
 		glUniform4fv(U(u_colorscale), 1, colorscale);
 
 		setTexture(0, m->texture);
 
-		setMaterial(m->color, m->surfaceProps, 0.5f);
+		setMaterial(m->color, m->surfaceProps, CustomPipes::WorldPipeSwitch == CustomPipes::WORLDPIPE_PS2 ? 0.5f : 1.0f);
 
 		rw::SetRenderState(VERTEXALPHA, inst->vertexAlpha || m->color.alpha != 0xFF);
 
@@ -501,9 +511,9 @@ CreateWorldPipe(void)
 //		ReadTweakValueTable((char*)work_buff, WorldLightmapBlend);
 
 	{
-#include "shaders/scale_fs_gl.inc"
+#include "shaders/obj/scale_frag.inc"
-#include "shaders/leedsBuilding_vs_gl.inc"
+#include "shaders/obj/leedsBuilding_vert.inc"
-#include "shaders/leedsBuilding_mobile_vs_gl.inc"
+#include "shaders/obj/leedsBuilding_mobile_vert.inc"
 	const char *vs[] = { shaderDecl, header_vert_src, leedsBuilding_vert_src, nil };
 	const char *vs_mobile[] = { shaderDecl, header_vert_src, leedsBuilding_mobile_vert_src, nil };
 	const char *fs[] = { shaderDecl, header_frag_src, scale_frag_src, nil };
@@ -610,8 +620,8 @@ CreateGlossPipe(void)
 	using namespace rw::gl3;
 
 	{
-#include "shaders/neoGloss_fs_gl.inc"
+#include "shaders/obj/neoGloss_frag.inc"
-#include "shaders/neoGloss_vs_gl.inc"
+#include "shaders/obj/neoGloss_vert.inc"
 	const char *vs[] = { shaderDecl, header_vert_src, neoGloss_vert_src, nil };
 	const char *fs[] = { shaderDecl, header_frag_src, neoGloss_frag_src, nil };
 	neoGlossShader = Shader::create(vs, fs);
@@ -782,8 +792,8 @@ CreateRimLightPipes(void)
 	}
 
 	{
-#include "shaders/simple_fs_gl.inc"
+#include "shaders/obj/simple_frag.inc"
-#include "shaders/neoRimSkin_gl.inc"
+#include "shaders/obj/neoRimSkin_vert.inc"
 	const char *vs[] = { shaderDecl, header_vert_src, neoRimSkin_vert_src, nil };
 	const char *fs[] = { shaderDecl, header_frag_src, simple_frag_src, nil };
 	neoRimSkinShader = Shader::create(vs, fs);
@@ -791,8 +801,8 @@ CreateRimLightPipes(void)
 	}
 
 	{
-#include "shaders/simple_fs_gl.inc"
+#include "shaders/obj/simple_frag.inc"
-#include "shaders/neoRim_gl.inc"
+#include "shaders/obj/neoRim_vert.inc"
 	const char *vs[] = { shaderDecl, header_vert_src, neoRim_vert_src, nil };
 	const char *fs[] = { shaderDecl, header_frag_src, simple_frag_src, nil };
 	neoRimShader = Shader::create(vs, fs);
@@ -936,25 +946,17 @@ AtomicFirstPass(RpAtomic *atomic, int pass)
 			setAttribPointers(building->instHeader->attribDesc, building->instHeader->numAttribs);
 #endif
 
-			RGBAf amb, emiss;
+			CustomPipes::uploadWorldLights();
-			amb.red = CTimeCycle::GetAmbientRed();
-			amb.green = CTimeCycle::GetAmbientGreen();
-			amb.blue = CTimeCycle::GetAmbientBlue();
-			amb.alpha = 1.0f;
-			emiss = pAmbient->color;
-
-			glUniform4fv(U(CustomPipes::u_amb), 1, (float*)&amb);
-			glUniform4fv(U(CustomPipes::u_emiss), 1, (float*)&emiss);
 
 			colorscale[3] = 1.0f;
 
 			setupDone = true;
 		}
 
-		setMaterial(m->color, m->surfaceProps, 0.5f);
+		setMaterial(m->color, m->surfaceProps, CustomPipes::WorldPipeSwitch == CustomPipes::WORLDPIPE_PS2 ? 0.5f : 1.0f);
 
 		float cs = 1.0f;
-		if(CustomPipes::WorldPipeSwitch == CustomPipes::WORLDPIPE_PS2 && m->texture)
+		if(CustomPipes::WorldPipeSwitch != CustomPipes::WORLDPIPE_MOBILE && m->texture)
 			cs = 255/128.0f;
 		colorscale[0] = colorscale[1] = colorscale[2] = cs;
 		glUniform4fv(U(CustomPipes::u_colorscale), 1, colorscale);
@@ -999,15 +1001,7 @@ RenderBlendPass(int pass)
 	else
 		CustomPipes::leedsWorldShader->use();
 
-	RGBAf amb, emiss;
+	CustomPipes::uploadWorldLights();
-	amb.red = CTimeCycle::GetAmbientRed();
-	amb.green = CTimeCycle::GetAmbientGreen();
-	amb.blue = CTimeCycle::GetAmbientBlue();
-	amb.alpha = 1.0f;
-	emiss = pAmbient->color;
-
-	glUniform4fv(U(CustomPipes::u_amb), 1, (float*)&amb);
-	glUniform4fv(U(CustomPipes::u_emiss), 1, (float*)&emiss);
 
 	float colorscale[4];
 	colorscale[3] = 1.0f;
@@ -1035,10 +1029,10 @@ RenderBlendPass(int pass)
 
 			rw::RGBA color = m->color;
 			color.alpha = (color.alpha * building->fadeAlpha)/255;
-			setMaterial(color, m->surfaceProps, 0.5f);
+			setMaterial(color, m->surfaceProps, CustomPipes::WorldPipeSwitch == CustomPipes::WORLDPIPE_PS2 ? 0.5f : 1.0f);
 
 			float cs = 1.0f;
-			if(CustomPipes::WorldPipeSwitch == CustomPipes::WORLDPIPE_PS2 && m->texture)
+			if(CustomPipes::WorldPipeSwitch != CustomPipes::WORLDPIPE_MOBILE && m->texture)
 				cs = 255/128.0f;
 			colorscale[0] = colorscale[1] = colorscale[2] = cs;
 			glUniform4fv(U(CustomPipes::u_colorscale), 1, colorscale);

src/extras/postfx.cpp

@@ -16,13 +16,15 @@
 RwRaster *CPostFX::pFrontBuffer;
 RwRaster *CPostFX::pBackBuffer;
 bool CPostFX::bJustInitialised;
-int CPostFX::EffectSwitch = POSTFX_NORMAL;
+int CPostFX::EffectSwitch = POSTFX_PS2;
 bool CPostFX::BlurOn = false;
 bool CPostFX::MotionBlurOn = false;
 
 static RwIm2DVertex Vertex[4];
 static RwIm2DVertex Vertex2[4];
 static RwImVertexIndex Index[6] = { 0, 1, 2, 0, 2, 3 };
+static RwIm2DVertex BlurVertex[12];
+static RwImVertexIndex BlurIndex[18] = { 0, 1, 2, 0, 2, 3,  4, 5, 6, 4, 6, 7,  8, 9, 10, 8, 10, 11 };
 
 #ifdef RW_D3D9
 void *colourfilterLCS_PS;
@@ -143,17 +145,17 @@ CPostFX::Open(RwCamera *cam)
 
 
 #ifdef RW_D3D9
-#include "shaders/colourfilterLCS_PS.inc"
+#include "shaders/obj/colourfilterLCS_PS.inc"
 	colourfilterLCS_PS = rw::d3d::createPixelShader(colourfilterLCS_PS_cso);
-#include "shaders/contrastPS.inc"
+#include "shaders/obj/contrastPS.inc"
 	contrast_PS = rw::d3d::createPixelShader(contrastPS_cso);
 #endif
 #ifdef RW_OPENGL
 	using namespace rw::gl3;
 
 	{
-#include "shaders/im2d_gl.inc"
+#include "shaders/obj/im2d_vert.inc"
-#include "shaders/colourfilterLCS_fs_gl.inc"
+#include "shaders/obj/colourfilterLCS_frag.inc"
 	const char *vs[] = { shaderDecl, header_vert_src, im2d_vert_src, nil };
 	const char *fs[] = { shaderDecl, header_frag_src, colourfilterLCS_frag_src, nil };
 	colourFilterLCS = Shader::create(vs, fs);
@@ -161,8 +163,8 @@ CPostFX::Open(RwCamera *cam)
 	}
 
 	{
-#include "shaders/im2d_gl.inc"
+#include "shaders/obj/im2d_vert.inc"
-#include "shaders/contrast_fs_gl.inc"
+#include "shaders/obj/contrast_frag.inc"
 	const char *vs[] = { shaderDecl, header_vert_src, im2d_vert_src, nil };
 	const char *fs[] = { shaderDecl, header_frag_src, contrast_frag_src, nil };
 	contrast = Shader::create(vs, fs);
@@ -205,9 +207,44 @@ CPostFX::Close(void)
 #endif
 }
 
+static float blurOffset = 0.6f;//3.0f/16.0f;	// not quite sure sure about this
+static float blurIntensity = 0.25f;
+
 void
 CPostFX::RenderOverlayBlur(RwCamera *cam, int32 r, int32 g, int32 b, int32 a)
 {
+	memcpy(BlurVertex, Vertex, sizeof(Vertex));
+	memcpy(BlurVertex+4, Vertex, sizeof(Vertex));
+	memcpy(BlurVertex+8, Vertex, sizeof(Vertex));
+	int intensity = 255*blurIntensity;
+	int i;
+	for(i = 0; i < 4; i++){
+		RwIm2DVertexSetScreenX(&BlurVertex[i], RwIm2DVertexGetScreenX(&BlurVertex[i]) + blurOffset);
+		RwIm2DVertexSetIntRGBA(&BlurVertex[i], 255, 255, 255, intensity);
+	}
+	for(i = 4; i < 8; i++){
+		RwIm2DVertexSetScreenX(&BlurVertex[i], RwIm2DVertexGetScreenX(&BlurVertex[i]) + blurOffset);
+		RwIm2DVertexSetScreenY(&BlurVertex[i], RwIm2DVertexGetScreenY(&BlurVertex[i]) + blurOffset);
+		RwIm2DVertexSetIntRGBA(&BlurVertex[i], 255, 255, 255, intensity);
+	}
+	for(i = 8; i < 12; i++){
+		RwIm2DVertexSetScreenY(&BlurVertex[i], RwIm2DVertexGetScreenY(&BlurVertex[i]) + blurOffset);
+		RwIm2DVertexSetIntRGBA(&BlurVertex[i], 255, 255, 255, intensity);
+	}
+
+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, pBackBuffer);
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+
+	RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, BlurVertex, 12, BlurIndex, 18);
+
+	// this sucks: should render colourfilter with blending instead
+	// but can't change equation to subtraction for PSP here
+	GetBackBuffer(cam);
+
+/* the old way
 	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, pFrontBuffer);
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
 
@@ -240,6 +277,7 @@ CPostFX::RenderOverlayBlur(RwCamera *cam, int32 r, int32 g, int32 b, int32 a)
 
 	RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, Vertex, 4, Index, 6);
 	RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, BlurOn ? Vertex2 : Vertex, 4, Index, 6);
+*/
 }
 
 void
@@ -291,7 +329,7 @@ CPostFX::RenderOverlayShader(RwCamera *cam, int32 r, int32 g, int32 b, int32 a)
 		blurcolors[0] = r*f/255.0f;
 		blurcolors[1] = g*f/255.0f;
 		blurcolors[2] = b*f/255.0f;
-		blurcolors[3] = 30/255.0f;
+		blurcolors[3] = EffectSwitch == POSTFX_PSP ? -1.0f : 1.0f;
 #ifdef RW_D3D9
 		rw::d3d::d3ddevice->SetPixelShaderConstantF(10, blurcolors, 1);
 		rw::d3d::im2dOverridePS = colourfilterLCS_PS;
@@ -339,11 +377,8 @@ CPostFX::NeedBackBuffer(void)
 	case POSTFX_SIMPLE:
 		// no actual rendering here
 		return false;
-	case POSTFX_NORMAL:
+	case POSTFX_PSP:
-		if(MotionBlurOn)
+	case POSTFX_PS2:
-			return false;
-		else
-			return true;
 	case POSTFX_MOBILE:
 		return true;
 	}
@@ -354,24 +389,11 @@ bool
 CPostFX::NeedFrontBuffer(int32 type)
 {
 	// Last frame -- needed for motion blur
-	if(CMBlur::Drunkness > 0.0f)
+	if(MotionBlurOn)
 		return true;
 	if(type == MOTION_BLUR_SNIPER)
 		return true;
 
-	switch(EffectSwitch){
-	case POSTFX_OFF:
-	case POSTFX_SIMPLE:
-		// no actual rendering here
-		return false;
-	case POSTFX_NORMAL:
-		if(MotionBlurOn)
-			return true;
-		else
-			return false;
-	case POSTFX_MOBILE:
-		return false;
-	}
 	return false;
 }
 
@@ -386,11 +408,17 @@ CPostFX::GetBackBuffer(RwCamera *cam)
 void
 CPostFX::Render(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 bluralpha)
 {
+	// LCS PS2 blur is drawn in three passes:
+	//  blend frame with current frame 3 times to blur a bit
+	//  blend one more time with colour filter
+	//  motion blur like normal
+
 	if(pFrontBuffer == nil)
 		Open(cam);
 	assert(pFrontBuffer);
 	assert(pBackBuffer);
 
+/*	// LCS: don't need that anymore
 	if(type == MOTION_BLUR_LIGHT_SCENE){
 		SmoothColor(red, green, blue, blur);
 		red = AvgRed;
@@ -398,6 +426,7 @@ CPostFX::Render(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blu
 		blue = AvgBlue;
 		blur = AvgAlpha;
 	}
+*/
 
 	if(NeedBackBuffer())
 		GetBackBuffer(cam);
@@ -405,10 +434,15 @@ CPostFX::Render(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blu
 	DefinedState();
 
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
 	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
 
+	if(BlurOn)
+		RenderOverlayBlur(cam, 0, 0, 0, 0);
+
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
+
+	// TODO(LCS): check this out
 	if(type == MOTION_BLUR_SNIPER){
 		if(!bJustInitialised)
 			RenderOverlaySniper(cam, red, green, blue, blur);
@@ -417,21 +451,16 @@ CPostFX::Render(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blu
 	case POSTFX_SIMPLE:
 		// no actual rendering here
 		break;
-	case POSTFX_NORMAL:
+	case POSTFX_PSP:
-		if(MotionBlurOn){
+	case POSTFX_PS2:
-			if(!bJustInitialised)
-				RenderOverlayBlur(cam, red, green, blue, blur);
-		}else{
-			RenderOverlayShader(cam, red, green, blue, blur);
-		}
-		break;
 	case POSTFX_MOBILE:
 		RenderOverlayShader(cam, red, green, blue, blur);
 		break;
 	}
 
+	if(MotionBlurOn)
 		if(!bJustInitialised)
-		RenderMotionBlur(cam, 175.0f * CMBlur::Drunkness);
+			RenderMotionBlur(cam, bluralpha);
 
 	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);

src/extras/postfx.h

@@ -7,9 +7,8 @@ class CPostFX
 public:
 	enum {
 		POSTFX_OFF,
-//		POSTFX_SIMPLE,
+		POSTFX_PSP,
-		POSTFX_NORMAL,
+		POSTFX_PS2,
-//		POSTFX_MOBILE
 
 		// not so sensible for the moment
 		POSTFX_SIMPLE = -1,

src/extras/screendroplets.cpp

@@ -112,14 +112,14 @@ ScreenDroplets::InitDraw(void)
 
 	openim2d_uv2();
 #ifdef RW_D3D9
-#include "shaders/screenDroplet_PS.inc"
+#include "shaders/obj/screenDroplet_PS.inc"
 	screenDroplet_PS = rw::d3d::createPixelShader(screenDroplet_PS_cso);
 #endif
 #ifdef RW_GL3
 	using namespace rw::gl3;
 	{
-#include "shaders/im2d_UV2_gl.inc"
+#include "shaders/obj/im2d_UV2_vert.inc"
-#include "shaders/screenDroplet_fs_gl.inc"
+#include "shaders/obj/screenDroplet_frag.inc"
 	const char *vs[] = { shaderDecl, header_vert_src, im2d_UV2_vert_src, nil };
 	const char *fs[] = { shaderDecl, header_frag_src, screenDroplet_frag_src, nil };
 	screenDroplet = Shader::create(vs, fs);

src/extras/shaders/Makefile

@@ -1,121 +0,0 @@
-all: im2d_gl.inc simple_fs_gl.inc default_UV2_gl.inc \
-	colourfilterLCS_fs_gl.inc contrast_fs_gl.inc \
-	neoRim_gl.inc neoRimSkin_gl.inc \
-	neoWorldVC_fs_gl.inc neoGloss_vs_gl.inc neoGloss_fs_gl.inc \
-	neoVehicle_vs_gl.inc neoVehicle_fs_gl.inc \
-	im2d_UV2_gl.inc screenDroplet_fs_gl.inc \
-	leedsBuilding_vs_gl.inc leedsBuilding_mobile_vs_gl.inc scale_fs_gl.inc \
-	leedsVehicle_vs_gl.inc leedsVehicle_add_gl.inc leedsVehicle_blend_gl.inc \
-	leedsVehicle_mobile_vs_gl.inc leedsVehicle_mobile_fs_gl.inc
-
-im2d_gl.inc: im2d.vert
-	(echo 'const char *im2d_vert_src =';\
-	 sed 's/..*/"&\\n"/' im2d.vert;\
-	 echo ';') >im2d_gl.inc
-
-colourfilterLCS_fs_gl.inc: colourfilterLCS.frag
-	(echo 'const char *colourfilterLCS_frag_src =';\
-	 sed 's/..*/"&\\n"/' colourfilterLCS.frag;\
-	 echo ';') >colourfilterLCS_fs_gl.inc
-simple_fs_gl.inc: simple.frag
-	(echo 'const char *simple_frag_src =';\
-	 sed 's/..*/"&\\n"/' simple.frag;\
-	 echo ';') >simple_fs_gl.inc
-
-default_UV2_gl.inc: default_UV2.vert
-	(echo 'const char *default_UV2_vert_src =';\
-	 sed 's/..*/"&\\n"/' default_UV2.vert;\
-	 echo ';') >default_UV2_gl.inc
-
-
-
-contrast_fs_gl.inc: contrast.frag
-	(echo 'const char *contrast_frag_src =';\
-	 sed 's/..*/"&\\n"/' contrast.frag;\
-	 echo ';') >contrast_fs_gl.inc
-
-
-neoRim_gl.inc: neoRim.vert
-	(echo 'const char *neoRim_vert_src =';\
-	 sed 's/..*/"&\\n"/' neoRim.vert;\
-	 echo ';') >neoRim_gl.inc
-
-neoRimSkin_gl.inc: neoRimSkin.vert
-	(echo 'const char *neoRimSkin_vert_src =';\
-	 sed 's/..*/"&\\n"/' neoRimSkin.vert;\
-	 echo ';') >neoRimSkin_gl.inc
-
-neoWorldVC_fs_gl.inc: neoWorldVC.frag
-	(echo 'const char *neoWorldVC_frag_src =';\
-	 sed 's/..*/"&\\n"/' neoWorldVC.frag;\
-	 echo ';') >neoWorldVC_fs_gl.inc
-
-neoGloss_fs_gl.inc: neoGloss.frag
-	(echo 'const char *neoGloss_frag_src =';\
-	 sed 's/..*/"&\\n"/' neoGloss.frag;\
-	 echo ';') >neoGloss_fs_gl.inc
-
-neoGloss_vs_gl.inc: neoGloss.vert
-	(echo 'const char *neoGloss_vert_src =';\
-	 sed 's/..*/"&\\n"/' neoGloss.vert;\
-	 echo ';') >neoGloss_vs_gl.inc
-
-neoVehicle_vs_gl.inc: neoVehicle.vert
-	(echo 'const char *neoVehicle_vert_src =';\
-	 sed 's/..*/"&\\n"/' neoVehicle.vert;\
-	 echo ';') >neoVehicle_vs_gl.inc
-
-neoVehicle_fs_gl.inc: neoVehicle.frag
-	(echo 'const char *neoVehicle_frag_src =';\
-	 sed 's/..*/"&\\n"/' neoVehicle.frag;\
-	 echo ';') >neoVehicle_fs_gl.inc
-
-im2d_UV2_gl.inc: im2d_UV2.vert
-	(echo 'const char *im2d_UV2_vert_src =';\
-	 sed 's/..*/"&\\n"/' im2d_UV2.vert;\
-	 echo ';') >im2d_UV2_gl.inc
-
-screenDroplet_fs_gl.inc: screenDroplet.frag
-	(echo 'const char *screenDroplet_frag_src =';\
-	 sed 's/..*/"&\\n"/' screenDroplet.frag;\
-	 echo ';') >screenDroplet_fs_gl.inc
-
-leedsBuilding_vs_gl.inc: leedsBuilding.vert
-	(echo 'const char *leedsBuilding_vert_src =';\
-	 sed 's/..*/"&\\n"/' leedsBuilding.vert;\
-	 echo ';') >leedsBuilding_vs_gl.inc
-
-leedsBuilding_mobile_vs_gl.inc: leedsBuilding_mobile.vert
-	(echo 'const char *leedsBuilding_mobile_vert_src =';\
-	 sed 's/..*/"&\\n"/' leedsBuilding_mobile.vert;\
-	 echo ';') >leedsBuilding_mobile_vs_gl.inc
-
-scale_fs_gl.inc: scale.frag
-	(echo 'const char *scale_frag_src =';\
-	 sed 's/..*/"&\\n"/' scale.frag;\
-	 echo ';') >scale_fs_gl.inc
-
-leedsVehicle_vs_gl.inc: leedsVehicle.vert
-	(echo 'const char *leedsVehicle_vert_src =';\
-	 sed 's/..*/"&\\n"/' leedsVehicle.vert;\
-	 echo ';') >leedsVehicle_vs_gl.inc
-
-leedsVehicle_add_gl.inc: leedsVehicle_add.frag
-	(echo 'const char *leedsVehicle_add_frag_src =';\
-	 sed 's/..*/"&\\n"/' leedsVehicle_add.frag;\
-	 echo ';') >leedsVehicle_add_gl.inc
-
-leedsVehicle_blend_gl.inc: leedsVehicle_blend.frag
-	(echo 'const char *leedsVehicle_blend_frag_src =';\
-	 sed 's/..*/"&\\n"/' leedsVehicle_blend.frag;\
-	 echo ';') >leedsVehicle_blend_gl.inc
-
-leedsVehicle_mobile_vs_gl.inc: leedsVehicle_mobile.vert
-	(echo 'const char *leedsVehicle_mobile_vert_src =';\
-	 sed 's/..*/"&\\n"/' leedsVehicle_mobile.vert;\
-	 echo ';') >leedsVehicle_mobile_vs_gl.inc
-
-leedsVehicle_mobile_fs_gl.inc: leedsVehicle_mobile.frag
-	(echo 'const char *leedsVehicle_mobile_frag_src =';\
-	 sed 's/..*/"&\\n"/' leedsVehicle_mobile.frag;\
-	 echo ';') >leedsVehicle_mobile_fs_gl.inc

src/extras/shaders/colourfilterLCS_PS.hlsl

@@ -1,13 +1,10 @@
 sampler2D tex : register(s0);
 float4 blurcol : register(c10);
 
-//float4 blurcols[10] : register(c15);
-
-
 float4 main(in float2 texcoord : TEXCOORD0) : COLOR0
 {
 	float4 dst = tex2D(tex, texcoord.xy);
-	dst += dst*blurcol;
+	dst += dst*blurcol*blurcol.a;
 	dst.a = 1.0;
 	return dst;
 }

src/extras/shaders/leedsDefault.frag

@@ -2,29 +2,45 @@ uniform sampler2D tex0;
 uniform sampler2D tex1;
 
 uniform float u_fxparams;
+uniform vec4 u_colorscale;
 
 #define shininess (u_fxparams)
 
 FSIN vec4 v_color;
 FSIN vec2 v_tex0;
+#if defined(PASS_BLEND) || defined(PASS_ADD)
 FSIN vec2 v_tex1;
+#endif
 FSIN float v_fog;
 
 void
 main(void)
 {
-	vec4 pass1 = v_color*texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y));
+	vec4 pass1 = v_color*texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y))*u_colorscale;
+	pass1.rgb = clamp(pass1.rgb, 0.0, 1.0);
+	pass1.rgb = mix(u_fogColor.rgb, pass1.rgb, v_fog);
+
+	vec4 color;
+#if defined(PASS_BLEND) || defined(PASS_ADD)
 	vec4 pass2 = texture(tex1, vec2(v_tex1.x, 1.0-v_tex1.y));
 	pass2.a *= shininess;
-
-	pass1.rgb = mix(u_fogColor.rgb, pass1.rgb, v_fog);
 	pass2.rgb = mix(vec3(0.0, 0.0, 0.0), pass2.rgb, v_fog);
 
 	// We simulate drawing this in two passes.
+#if defined(PASS_ADD)
+	// First pass with standard blending, second with addition
+	// We premultiply alpha so render state should be one.
+	color.rgb = pass1.rgb*pass1.a + pass2.rgb*pass2.a;
+	color.a = pass1.a;
+#elif defined(PASS_BLEND)
 	// We premultiply alpha so render state should be one.
-	vec4 color;
 	color.rgb = pass1.rgb*pass1.a*(1.0-pass2.a) + pass2.rgb*pass2.a;
 	color.a = pass1.a*(1.0-pass2.a) + pass2.a;
+#endif
+
+#else
+	color = pass1;
+#endif
 
 	DoAlphaTest(color.a);
 

src/extras/shaders/leedsDefault.vert

@@ -0,0 +1,51 @@
+#ifdef ENVMAP
+uniform mat4 u_texMatrix;
+#endif
+#ifdef SKIN
+uniform mat4 u_boneMatrices[64];
+#endif
+
+VSIN(ATTRIB_POS)	vec3 in_pos;
+
+VSOUT vec4 v_color;
+VSOUT vec2 v_tex0;
+#ifdef ENVMAP
+VSOUT vec2 v_tex1;
+#endif
+VSOUT float v_fog;
+
+void
+main(void)
+{
+#ifdef SKIN
+	vec3 SkinVertex = vec3(0.0, 0.0, 0.0);
+	vec3 SkinNormal = vec3(0.0, 0.0, 0.0);
+	for(int i = 0; i < 4; i++){
+		SkinVertex += (u_boneMatrices[int(in_indices[i])] * vec4(in_pos, 1.0)).xyz * in_weights[i];
+		SkinNormal += (mat3(u_boneMatrices[int(in_indices[i])]) * in_normal) * in_weights[i];
+	}
+
+	vec4 Vertex = u_world * vec4(SkinVertex, 1.0);
+	gl_Position = u_proj * u_view * Vertex;
+	vec3 Normal = mat3(u_world) * SkinNormal;
+#else
+	vec4 Vertex = u_world * vec4(in_pos, 1.0);
+	gl_Position = u_proj * u_view * Vertex;
+	vec3 Normal = mat3(u_world) * in_normal;
+#endif
+
+	v_tex0 = in_tex0;
+#ifdef ENVMAP
+	v_tex1 = (u_texMatrix * vec4(Normal, 1.0)).xy;
+#endif
+
+	v_color = in_color;
+	v_color.rgb += u_ambLight.rgb*surfAmbient;
+	v_color.rgb += DoDynamicLight(Vertex.xyz, Normal)*surfDiffuse;
+	// PS2 clamps before material color
+	// PSP clamps after...maybe another constant for this?
+	v_color = clamp(v_color, 0.0, 1.0);
+	v_color *= u_matColor;
+
+	v_fog = DoFog(gl_Position.w);
+}

src/extras/shaders/leedsDefault_PS_x.hlsl

@@ -1,7 +1,9 @@
 struct VS_out {
 	float4 Position		: POSITION;
 	float3 TexCoord0	: TEXCOORD0;
+#if defined(PASS_BLEND) || defined(PASS_ADD)
 	float2 TexCoord1	: TEXCOORD1;
+#endif
 	float4 Color		: COLOR0;
 };
 
@@ -10,25 +12,38 @@ sampler2D envTex : register(s1);
 
 float4 fogColor : register(c0);
 
-float4 fxparams : register(c1);
+float4 colorscale : register(c1);
+float4 fxparams : register(c2);
 
 #define shininess (fxparams.x)
 
 float4 main(VS_out input) : COLOR
 {
-	float4 pass1 = input.Color*tex2D(diffTex, input.TexCoord0.xy);
+	float4 pass1 = input.Color*tex2D(diffTex, input.TexCoord0.xy)*colorscale;
+	pass1.rgb = clamp(pass1.rgb, 0.0, 1.0);
+	pass1.rgb = lerp(fogColor.rgb, pass1.rgb, input.TexCoord0.z);
+
+	float4 color;
+#if defined(PASS_BLEND) || defined(PASS_ADD)
 	float4 pass2 = tex2D(envTex, input.TexCoord1.xy);
 	pass2.a *= shininess;
-
-	pass1.rgb = lerp(fogColor.rgb, pass1.rgb, input.TexCoord0.z);
 	pass2.rgb = lerp(float3(0.0, 0.0, 0.0), pass2.rgb, input.TexCoord0.z);
 
 	// We simulate drawing this in two passes.
+#if defined(PASS_ADD)
 	// First pass with standard blending, second with addition
 	// We premultiply alpha so render state should be one.
-	float4 color;
 	color.rgb = pass1.rgb*pass1.a + pass2.rgb*pass2.a;
 	color.a = pass1.a;
+#elif defined(PASS_BLEND)
+	// We premultiply alpha so render state should be one.
+	color.rgb = pass1.rgb*pass1.a*(1.0-pass2.a) + pass2.rgb*pass2.a;
+	color.a = pass1.a*(1.0-pass2.a) + pass2.a;
+#endif
+
+#else
+	color = pass1;
+#endif
 
 	return color;
 }

src/extras/shaders/leedsDefault_VS_x.hlsl

@@ -1,6 +1,11 @@
 #include "standardConstants.h"
 
+#ifdef ENVMAP
 float4x4	texMat	: register(c41);
+#endif
+#ifdef SKIN
+float4x3 boneMatrices[64] : register(c41);
+#endif
 
 struct VS_in
 {
@@ -8,12 +13,18 @@ struct VS_in
 	float3 Normal		: NORMAL;
 	float2 TexCoord		: TEXCOORD0;
 	float4 Prelight		: COLOR0;
+#ifdef SKIN
+	float4 Weights		: BLENDWEIGHT;
+	int4 Indices		: BLENDINDICES;
+#endif
 };
 
 struct VS_out {
 	float4 Position		: POSITION;
 	float3 TexCoord0	: TEXCOORD0;	// also fog
+#ifdef ENVMAP
 	float2 TexCoord1	: TEXCOORD1;
+#endif
 	float4 Color		: COLOR0;
 };
 
@@ -22,12 +33,27 @@ VS_out main(in VS_in input)
 {
 	VS_out output;
 
+#ifdef SKIN
+	int j;
+	float3 SkinVertex = float3(0.0, 0.0, 0.0);
+	float3 SkinNormal = float3(0.0, 0.0, 0.0);
+	for(j = 0; j < 4; j++){
+		SkinVertex += mul(input.Position, boneMatrices[input.Indices[j]]).xyz * input.Weights[j];
+		SkinNormal += mul(input.Normal, (float3x3)boneMatrices[input.Indices[j]]).xyz * input.Weights[j];
+	}
+	output.Position = mul(combinedMat, SkinVertex);
+//	float3 V = mul(worldMat, SkinVertex).xyz;
+	float3 N = mul(normalMat, SkinNormal);
+#else
 	output.Position = mul(combinedMat, input.Position);
-	float3 V = mul(worldMat, input.Position).xyz;
+//	float3 V = mul(worldMat, input.Position).xyz;
 	float3 N = mul(normalMat, input.Normal);
+#endif
 
 	output.TexCoord0.xy = input.TexCoord;
+#ifdef ENVMAP
 	output.TexCoord1 = mul(texMat, float4(N, 1.0)).xy;
+#endif
 
 	output.Color = input.Prelight;
 	output.Color.rgb += ambientLight.rgb * surfAmbient;
@@ -36,6 +62,7 @@ VS_out main(in VS_in input)
 	for(i = 0; i < numDirLights; i++)
 		output.Color.xyz += DoDirLight(lights[i+firstDirLight], N)*surfDiffuse;
 	// PS2 clamps before material color
+	// PSP clamps after...maybe another constant for this?
 	output.Color = clamp(output.Color, 0.0, 1.0);
 	output.Color *= matCol;
 

src/extras/shaders/leedsVehicle.vert

@@ -1,27 +0,0 @@
-uniform mat4 u_texMatrix;
-
-VSIN(ATTRIB_POS)	vec3 in_pos;
-
-VSOUT vec4 v_color;
-VSOUT vec2 v_tex0;
-VSOUT vec2 v_tex1;
-VSOUT float v_fog;
-
-void
-main(void)
-{
-	vec4 Vertex = u_world * vec4(in_pos, 1.0);
-	gl_Position = u_proj * u_view * Vertex;
-	vec3 Normal = mat3(u_world) * in_normal;
-
-	v_tex0 = in_tex0;
-	v_tex1 = (u_texMatrix * vec4(Normal, 1.0)).xy;
-
-	v_color = in_color;
-	v_color.rgb += u_ambLight.rgb*surfAmbient;
-	v_color.rgb += DoDynamicLight(Vertex.xyz, Normal)*surfDiffuse;
-	v_color = clamp(v_color, 0.0, 1.0);
-	v_color *= u_matColor;
-
-	v_fog = DoFog(gl_Position.w);
-}

src/extras/shaders/leedsVehicle_add.frag

@@ -1,32 +0,0 @@
-uniform sampler2D tex0;
-uniform sampler2D tex1;
-
-uniform float u_fxparams;
-
-#define shininess (u_fxparams)
-
-FSIN vec4 v_color;
-FSIN vec2 v_tex0;
-FSIN vec2 v_tex1;
-FSIN float v_fog;
-
-void
-main(void)
-{
-	vec4 pass1 = v_color*texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y));
-	vec4 pass2 = texture(tex1, vec2(v_tex1.x, 1.0-v_tex1.y));
-	pass2.a *= shininess;
-
-	pass1.rgb = mix(u_fogColor.rgb, pass1.rgb, v_fog);
-	pass2.rgb = mix(vec3(0.0, 0.0, 0.0), pass2.rgb, v_fog);
-
-	// We simulate drawing this in two passes.
-	// We premultiply alpha so render state should be one.
-	vec4 color;
-	color.rgb = pass1.rgb*pass1.a + pass2.rgb*pass2.a;
-	color.a = pass1.a;
-
-	DoAlphaTest(color.a);
-
-	FRAGCOLOR(color);
-}

src/extras/shaders/leedsVehicle_add_PS.inc

@@ -1,44 +0,0 @@
-static unsigned char leedsVehicle_add_PS_cso[] = {
-  0x00, 0x02, 0xff, 0xff, 0xfe, 0xff, 0x40, 0x00, 0x43, 0x54, 0x41, 0x42,
-  0x1c, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xff,
-  0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-  0xc1, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-  0x01, 0x00, 0x02, 0x00, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x84, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x06, 0x00,
-  0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00,
-  0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0xa8, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00,
-  0x01, 0x00, 0x06, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x64, 0x69, 0x66, 0x66, 0x54, 0x65, 0x78, 0x00, 0x04, 0x00, 0x0c, 0x00,
-  0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x65, 0x6e, 0x76, 0x54, 0x65, 0x78, 0x00, 0xab, 0x04, 0x00, 0x0c, 0x00,
-  0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x66, 0x6f, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0xab, 0xab, 0xab,
-  0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x66, 0x78, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73,
-  0x00, 0x70, 0x73, 0x5f, 0x32, 0x5f, 0x30, 0x00, 0x4d, 0x69, 0x63, 0x72,
-  0x6f, 0x73, 0x6f, 0x66, 0x74, 0x20, 0x28, 0x52, 0x29, 0x20, 0x48, 0x4c,
-  0x53, 0x4c, 0x20, 0x53, 0x68, 0x61, 0x64, 0x65, 0x72, 0x20, 0x43, 0x6f,
-  0x6d, 0x70, 0x69, 0x6c, 0x65, 0x72, 0x20, 0x39, 0x2e, 0x32, 0x39, 0x2e,
-  0x39, 0x35, 0x32, 0x2e, 0x33, 0x31, 0x31, 0x31, 0x00, 0xab, 0xab, 0xab,
-  0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x07, 0xb0,
-  0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x03, 0xb0,
-  0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x0f, 0x90,
-  0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x90, 0x00, 0x08, 0x0f, 0xa0,
-  0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x90, 0x01, 0x08, 0x0f, 0xa0,
-  0x42, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0x80, 0x01, 0x00, 0xe4, 0xb0,
-  0x01, 0x08, 0xe4, 0xa0, 0x42, 0x00, 0x00, 0x03, 0x01, 0x00, 0x0f, 0x80,
-  0x00, 0x00, 0xe4, 0xb0, 0x00, 0x08, 0xe4, 0xa0, 0x05, 0x00, 0x00, 0x03,
-  0x00, 0x00, 0x08, 0x80, 0x00, 0x00, 0xff, 0x80, 0x01, 0x00, 0x00, 0xa0,
-  0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0xe4, 0x80,
-  0x00, 0x00, 0xaa, 0xb0, 0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x07, 0x80,
-  0x00, 0x00, 0xff, 0x80, 0x00, 0x00, 0xe4, 0x80, 0x04, 0x00, 0x00, 0x04,
-  0x01, 0x00, 0x07, 0x80, 0x00, 0x00, 0xe4, 0x90, 0x01, 0x00, 0xe4, 0x80,
-  0x00, 0x00, 0xe4, 0xa1, 0x05, 0x00, 0x00, 0x03, 0x02, 0x00, 0x08, 0x80,
-  0x01, 0x00, 0xff, 0x80, 0x00, 0x00, 0xff, 0x90, 0x04, 0x00, 0x00, 0x04,
-  0x01, 0x00, 0x07, 0x80, 0x00, 0x00, 0xaa, 0xb0, 0x01, 0x00, 0xe4, 0x80,
-  0x00, 0x00, 0xe4, 0xa0, 0x04, 0x00, 0x00, 0x04, 0x02, 0x00, 0x07, 0x80,
-  0x01, 0x00, 0xe4, 0x80, 0x02, 0x00, 0xff, 0x80, 0x00, 0x00, 0xe4, 0x80,
-  0x01, 0x00, 0x00, 0x02, 0x00, 0x08, 0x0f, 0x80, 0x02, 0x00, 0xe4, 0x80,
-  0xff, 0xff, 0x00, 0x00
-};

src/extras/shaders/leedsVehicle_add_gl.inc

@@ -1,34 +0,0 @@
-const char *leedsVehicle_add_frag_src =
-"uniform sampler2D tex0;\n"
-"uniform sampler2D tex1;\n"
-
-"uniform float u_fxparams;\n"
-
-"#define shininess (u_fxparams)\n"
-
-"FSIN vec4 v_color;\n"
-"FSIN vec2 v_tex0;\n"
-"FSIN vec2 v_tex1;\n"
-"FSIN float v_fog;\n"
-
-"void\n"
-"main(void)\n"
-"{\n"
-"	vec4 pass1 = v_color*texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y));\n"
-"	vec4 pass2 = texture(tex1, vec2(v_tex1.x, 1.0-v_tex1.y));\n"
-"	pass2.a *= shininess;\n"
-
-"	pass1.rgb = mix(u_fogColor.rgb, pass1.rgb, v_fog);\n"
-"	pass2.rgb = mix(vec3(0.0, 0.0, 0.0), pass2.rgb, v_fog);\n"
-
-"	// We simulate drawing this in two passes.\n"
-"	// We premultiply alpha so render state should be one.\n"
-"	vec4 color;\n"
-"	color.rgb = pass1.rgb*pass1.a + pass2.rgb*pass2.a;\n"
-"	color.a = pass1.a;\n"
-
-"	DoAlphaTest(color.a);\n"
-
-"	FRAGCOLOR(color);\n"
-"}\n"
-;

src/extras/shaders/leedsVehicle_blend_PS.hlsl

@@ -1,33 +0,0 @@
-struct VS_out {
-	float4 Position		: POSITION;
-	float3 TexCoord0	: TEXCOORD0;
-	float2 TexCoord1	: TEXCOORD1;
-	float4 Color		: COLOR0;
-};
-
-sampler2D diffTex : register(s0);
-sampler2D envTex : register(s1);
-
-float4 fogColor : register(c0);
-
-float4 fxparams : register(c1);
-
-#define shininess (fxparams.x)
-
-float4 main(VS_out input) : COLOR
-{
-	float4 pass1 = input.Color*tex2D(diffTex, input.TexCoord0.xy);
-	float4 pass2 = tex2D(envTex, input.TexCoord1.xy);
-	pass2.a *= shininess;
-
-	pass1.rgb = lerp(fogColor.rgb, pass1.rgb, input.TexCoord0.z);
-	pass2.rgb = lerp(float3(0.0, 0.0, 0.0), pass2.rgb, input.TexCoord0.z);
-
-	// We simulate drawing this in two passes.
-	// We premultiply alpha so render state should be one.
-	float4 color;
-	color.rgb = pass1.rgb*pass1.a*(1.0-pass2.a) + pass2.rgb*pass2.a;
-	color.a = pass1.a*(1.0-pass2.a) + pass2.a;
-
-	return color;
-}

src/extras/shaders/leedsVehicle_blend_PS.inc

@@ -1,50 +0,0 @@
-static unsigned char leedsVehicle_blend_PS_cso[] = {
-  0x00, 0x02, 0xff, 0xff, 0xfe, 0xff, 0x40, 0x00, 0x43, 0x54, 0x41, 0x42,
-  0x1c, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xff,
-  0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-  0xc1, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-  0x01, 0x00, 0x02, 0x00, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x84, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x06, 0x00,
-  0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00,
-  0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0xa8, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00,
-  0x01, 0x00, 0x06, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x64, 0x69, 0x66, 0x66, 0x54, 0x65, 0x78, 0x00, 0x04, 0x00, 0x0c, 0x00,
-  0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x65, 0x6e, 0x76, 0x54, 0x65, 0x78, 0x00, 0xab, 0x04, 0x00, 0x0c, 0x00,
-  0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x66, 0x6f, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0xab, 0xab, 0xab,
-  0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x66, 0x78, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73,
-  0x00, 0x70, 0x73, 0x5f, 0x32, 0x5f, 0x30, 0x00, 0x4d, 0x69, 0x63, 0x72,
-  0x6f, 0x73, 0x6f, 0x66, 0x74, 0x20, 0x28, 0x52, 0x29, 0x20, 0x48, 0x4c,
-  0x53, 0x4c, 0x20, 0x53, 0x68, 0x61, 0x64, 0x65, 0x72, 0x20, 0x43, 0x6f,
-  0x6d, 0x70, 0x69, 0x6c, 0x65, 0x72, 0x20, 0x39, 0x2e, 0x32, 0x39, 0x2e,
-  0x39, 0x35, 0x32, 0x2e, 0x33, 0x31, 0x31, 0x31, 0x00, 0xab, 0xab, 0xab,
-  0x51, 0x00, 0x00, 0x05, 0x02, 0x00, 0x0f, 0xa0, 0x00, 0x00, 0x80, 0x3f,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x07, 0xb0,
-  0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x03, 0xb0,
-  0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x0f, 0x90,
-  0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x90, 0x00, 0x08, 0x0f, 0xa0,
-  0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x90, 0x01, 0x08, 0x0f, 0xa0,
-  0x42, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0xb0,
-  0x00, 0x08, 0xe4, 0xa0, 0x42, 0x00, 0x00, 0x03, 0x01, 0x00, 0x0f, 0x80,
-  0x01, 0x00, 0xe4, 0xb0, 0x01, 0x08, 0xe4, 0xa0, 0x04, 0x00, 0x00, 0x04,
-  0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0xe4, 0x90, 0x00, 0x00, 0xe4, 0x80,
-  0x00, 0x00, 0xe4, 0xa1, 0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08, 0x80,
-  0x00, 0x00, 0xff, 0x80, 0x00, 0x00, 0xff, 0x90, 0x04, 0x00, 0x00, 0x04,
-  0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0xaa, 0xb0, 0x00, 0x00, 0xe4, 0x80,
-  0x00, 0x00, 0xe4, 0xa0, 0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x07, 0x80,
-  0x00, 0x00, 0xff, 0x80, 0x00, 0x00, 0xe4, 0x80, 0x05, 0x00, 0x00, 0x03,
-  0x01, 0x00, 0x07, 0x80, 0x01, 0x00, 0xe4, 0x80, 0x00, 0x00, 0xaa, 0xb0,
-  0x05, 0x00, 0x00, 0x03, 0x02, 0x00, 0x08, 0x80, 0x01, 0x00, 0xff, 0x80,
-  0x01, 0x00, 0x00, 0xa0, 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x80,
-  0x01, 0x00, 0x00, 0xa0, 0x04, 0x00, 0x00, 0x04, 0x01, 0x00, 0x08, 0x80,
-  0x01, 0x00, 0xff, 0x80, 0x02, 0x00, 0x00, 0x81, 0x02, 0x00, 0x00, 0xa0,
-  0x04, 0x00, 0x00, 0x04, 0x03, 0x00, 0x08, 0x80, 0x00, 0x00, 0xff, 0x80,
-  0x01, 0x00, 0xff, 0x80, 0x02, 0x00, 0xff, 0x80, 0x12, 0x00, 0x00, 0x04,
-  0x03, 0x00, 0x07, 0x80, 0x02, 0x00, 0xff, 0x80, 0x01, 0x00, 0xe4, 0x80,
-  0x00, 0x00, 0xe4, 0x80, 0x01, 0x00, 0x00, 0x02, 0x00, 0x08, 0x0f, 0x80,
-  0x03, 0x00, 0xe4, 0x80, 0xff, 0xff, 0x00, 0x00
-};

src/extras/shaders/leedsVehicle_mobile_PS.hlsl

@@ -14,9 +14,9 @@ sampler2D envTex : register(s1);
 
 float4 fogColor : register(c0);
 
-float4 fxparams : register(c1);
+float4 fxparams : register(c2);
-float3 skyTop : register(c2);
+float3 skyTop : register(c3);
-float3 skyBot : register(c3);
+float3 skyBot : register(c4);
 
 #define shininess (fxparams.x)
 

src/extras/shaders/leedsVehicle_vs_gl.inc

@@ -1,29 +0,0 @@
-const char *leedsVehicle_vert_src =
-"uniform mat4 u_texMatrix;\n"
-
-"VSIN(ATTRIB_POS)	vec3 in_pos;\n"
-
-"VSOUT vec4 v_color;\n"
-"VSOUT vec2 v_tex0;\n"
-"VSOUT vec2 v_tex1;\n"
-"VSOUT float v_fog;\n"
-
-"void\n"
-"main(void)\n"
-"{\n"
-"	vec4 Vertex = u_world * vec4(in_pos, 1.0);\n"
-"	gl_Position = u_proj * u_view * Vertex;\n"
-"	vec3 Normal = mat3(u_world) * in_normal;\n"
-
-"	v_tex0 = in_tex0;\n"
-"	v_tex1 = (u_texMatrix * vec4(Normal, 1.0)).xy;\n"
-
-"	v_color = in_color;\n"
-"	v_color.rgb += u_ambLight.rgb*surfAmbient;\n"
-"	v_color.rgb += DoDynamicLight(Vertex.xyz, Normal)*surfDiffuse;\n"
-"	v_color = clamp(v_color, 0.0, 1.0);\n"
-"	v_color *= u_matColor;\n"
-
-"	v_fog = DoFog(gl_Position.w);\n"
-"}\n"
-;

src/extras/shaders/make.cmd

@@ -1,3 +0,0 @@
-@echo off
-for %%f in (*PS.hlsl) do "%DXSDK_DIR%\Utilities\bin\x86\fxc.exe" /T ps_2_0 /nologo /E main /Fo %%~nf.cso %%f
-for %%f in (*VS.hlsl) do "%DXSDK_DIR%\Utilities\bin\x86\fxc.exe" /T vs_2_0 /nologo /E main /Fo %%~nf.cso %%f

src/extras/shaders/make_glsl.sh

@@ -0,0 +1,9 @@
+#!sh
+for i in *.vert; do
+	echo $i
+	./makeinc_glsl.sh $i
+done
+for i in *.frag; do
+	echo $i
+	./makeinc_glsl.sh $i
+done

src/extras/shaders/make_hlsl.cmd

@@ -0,0 +1,7 @@
+@echo off
+for %%f in (*PS.hlsl) do "%DXSDK_DIR%\Utilities\bin\x86\fxc.exe" /T ps_2_0 /nologo /E main /Fo obj\%%~nf.cso %%f
+for %%f in (*VS.hlsl) do "%DXSDK_DIR%\Utilities\bin\x86\fxc.exe" /T vs_2_0 /nologo /E main /Fo obj\%%~nf.cso %%f
+
+"%DXSDK_DIR%\Utilities\bin\x86\fxc.exe" /T vs_2_0 /nologo /E main /DENVMAP /Fo obj\leedsDefault_ENV_VS.cso leedsDefault_VS_x.hlsl
+"%DXSDK_DIR%\Utilities\bin\x86\fxc.exe" /T ps_2_0 /nologo /E main /DPASS_ADD /Fo obj\leedsDefault_ADD_PS.cso leedsDefault_PS_x.hlsl
+"%DXSDK_DIR%\Utilities\bin\x86\fxc.exe" /T ps_2_0 /nologo /E main /DPASS_BLEND /Fo obj\leedsDefault_BLEND_PS.cso leedsDefault_PS_x.hlsl

src/extras/shaders/makeinc_glsl.sh

@@ -0,0 +1,6 @@
+#!sh
+ext=${1##*.}
+name=${1%.*}
+(echo "const char *${name}_${ext}_src =";\
+sed 's/..*/"&\\n"/' $1;\
+echo ';') > obj/${name}_${ext}.inc

src/extras/shaders/makeinc_hlsl.sh

@@ -1,4 +1,5 @@
 #!sh
+cd obj
 for i in *cso; do
 	(echo -n 'static '
 	xxd -i $i | grep -v '_len = ') > ${i%cso}inc

src/extras/shaders/obj/colourfilterLCS_PS.inc

@@ -19,9 +19,10 @@ static unsigned char colourfilterLCS_PS_cso[] = {
   0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x03, 0xb0,
   0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x90, 0x00, 0x08, 0x0f, 0xa0,
   0x42, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0xb0,
-  0x00, 0x08, 0xe4, 0xa0, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x07, 0x80,
+  0x00, 0x08, 0xe4, 0xa0, 0x05, 0x00, 0x00, 0x03, 0x01, 0x00, 0x07, 0x80,
-  0x00, 0x00, 0xe4, 0x80, 0x0a, 0x00, 0xe4, 0xa0, 0x00, 0x00, 0xe4, 0x80,
+  0x00, 0x00, 0xe4, 0x80, 0x0a, 0x00, 0xe4, 0xa0, 0x04, 0x00, 0x00, 0x04,
-  0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x08, 0x80, 0x00, 0x00, 0x00, 0xa0,
+  0x00, 0x00, 0x07, 0x80, 0x01, 0x00, 0xe4, 0x80, 0x0a, 0x00, 0xff, 0xa0,
-  0x01, 0x00, 0x00, 0x02, 0x00, 0x08, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0x80,
+  0x00, 0x00, 0xe4, 0x80, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x08, 0x80,
-  0xff, 0xff, 0x00, 0x00
+  0x00, 0x00, 0x00, 0xa0, 0x01, 0x00, 0x00, 0x02, 0x00, 0x08, 0x0f, 0x80,
+  0x00, 0x00, 0xe4, 0x80, 0xff, 0xff, 0x00, 0x00
 };

src/extras/shaders/obj/leedsDefault_ADD_PS.inc

@@ -0,0 +1,47 @@
+static unsigned char leedsDefault_ADD_PS_cso[] = {
+  0x00, 0x02, 0xff, 0xff, 0xfe, 0xff, 0x47, 0x00, 0x43, 0x54, 0x41, 0x42,
+  0x1c, 0x00, 0x00, 0x00, 0xe5, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xff,
+  0x05, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+  0xde, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00,
+  0x01, 0x00, 0x06, 0x00, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x9c, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00,
+  0xa4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x06, 0x00, 0xbc, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x02, 0x00, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xd5, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x0a, 0x00,
+  0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x6f, 0x6c, 0x6f,
+  0x72, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x00, 0xab, 0x01, 0x00, 0x03, 0x00,
+  0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x64, 0x69, 0x66, 0x66, 0x54, 0x65, 0x78, 0x00, 0x04, 0x00, 0x0c, 0x00,
+  0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x65, 0x6e, 0x76, 0x54, 0x65, 0x78, 0x00, 0xab, 0x04, 0x00, 0x0c, 0x00,
+  0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x66, 0x6f, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0x66, 0x78, 0x70,
+  0x61, 0x72, 0x61, 0x6d, 0x73, 0x00, 0x70, 0x73, 0x5f, 0x32, 0x5f, 0x30,
+  0x00, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x6f, 0x66, 0x74, 0x20, 0x28,
+  0x52, 0x29, 0x20, 0x48, 0x4c, 0x53, 0x4c, 0x20, 0x53, 0x68, 0x61, 0x64,
+  0x65, 0x72, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x72, 0x20,
+  0x39, 0x2e, 0x32, 0x39, 0x2e, 0x39, 0x35, 0x32, 0x2e, 0x33, 0x31, 0x31,
+  0x31, 0x00, 0xab, 0xab, 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80,
+  0x00, 0x00, 0x07, 0xb0, 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80,
+  0x01, 0x00, 0x03, 0xb0, 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80,
+  0x00, 0x00, 0x0f, 0x90, 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x90,
+  0x00, 0x08, 0x0f, 0xa0, 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x90,
+  0x01, 0x08, 0x0f, 0xa0, 0x42, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0x80,
+  0x01, 0x00, 0xe4, 0xb0, 0x01, 0x08, 0xe4, 0xa0, 0x42, 0x00, 0x00, 0x03,
+  0x01, 0x00, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0xb0, 0x00, 0x08, 0xe4, 0xa0,
+  0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08, 0x80, 0x00, 0x00, 0xff, 0x80,
+  0x02, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x07, 0x80,
+  0x00, 0x00, 0xe4, 0x80, 0x00, 0x00, 0xaa, 0xb0, 0x05, 0x00, 0x00, 0x03,
+  0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0xff, 0x80, 0x00, 0x00, 0xe4, 0x80,
+  0x05, 0x00, 0x00, 0x03, 0x01, 0x00, 0x0f, 0x80, 0x01, 0x00, 0xe4, 0x80,
+  0x00, 0x00, 0xe4, 0x90, 0x05, 0x00, 0x00, 0x03, 0x01, 0x00, 0x0f, 0x80,
+  0x01, 0x00, 0xe4, 0x80, 0x01, 0x00, 0xe4, 0xa0, 0x01, 0x00, 0x00, 0x02,
+  0x01, 0x00, 0x17, 0x80, 0x01, 0x00, 0xe4, 0x80, 0x12, 0x00, 0x00, 0x04,
+  0x02, 0x00, 0x07, 0x80, 0x00, 0x00, 0xaa, 0xb0, 0x01, 0x00, 0xe4, 0x80,
+  0x00, 0x00, 0xe4, 0xa0, 0x04, 0x00, 0x00, 0x04, 0x01, 0x00, 0x07, 0x80,
+  0x02, 0x00, 0xe4, 0x80, 0x01, 0x00, 0xff, 0x80, 0x00, 0x00, 0xe4, 0x80,
+  0x01, 0x00, 0x00, 0x02, 0x00, 0x08, 0x0f, 0x80, 0x01, 0x00, 0xe4, 0x80,
+  0xff, 0xff, 0x00, 0x00
+};

src/extras/shaders/obj/leedsDefault_BLEND_PS.inc

@@ -0,0 +1,53 @@
+static unsigned char leedsDefault_BLEND_PS_cso[] = {
+  0x00, 0x02, 0xff, 0xff, 0xfe, 0xff, 0x47, 0x00, 0x43, 0x54, 0x41, 0x42,
+  0x1c, 0x00, 0x00, 0x00, 0xe5, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xff,
+  0x05, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+  0xde, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00,
+  0x01, 0x00, 0x06, 0x00, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x9c, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00,
+  0xa4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x06, 0x00, 0xbc, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x02, 0x00, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xd5, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x0a, 0x00,
+  0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x6f, 0x6c, 0x6f,
+  0x72, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x00, 0xab, 0x01, 0x00, 0x03, 0x00,
+  0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x64, 0x69, 0x66, 0x66, 0x54, 0x65, 0x78, 0x00, 0x04, 0x00, 0x0c, 0x00,
+  0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x65, 0x6e, 0x76, 0x54, 0x65, 0x78, 0x00, 0xab, 0x04, 0x00, 0x0c, 0x00,
+  0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x66, 0x6f, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0x66, 0x78, 0x70,
+  0x61, 0x72, 0x61, 0x6d, 0x73, 0x00, 0x70, 0x73, 0x5f, 0x32, 0x5f, 0x30,
+  0x00, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x6f, 0x66, 0x74, 0x20, 0x28,
+  0x52, 0x29, 0x20, 0x48, 0x4c, 0x53, 0x4c, 0x20, 0x53, 0x68, 0x61, 0x64,
+  0x65, 0x72, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x72, 0x20,
+  0x39, 0x2e, 0x32, 0x39, 0x2e, 0x39, 0x35, 0x32, 0x2e, 0x33, 0x31, 0x31,
+  0x31, 0x00, 0xab, 0xab, 0x51, 0x00, 0x00, 0x05, 0x03, 0x00, 0x0f, 0xa0,
+  0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80,
+  0x00, 0x00, 0x07, 0xb0, 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80,
+  0x01, 0x00, 0x03, 0xb0, 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80,
+  0x00, 0x00, 0x0f, 0x90, 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x90,
+  0x00, 0x08, 0x0f, 0xa0, 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x90,
+  0x01, 0x08, 0x0f, 0xa0, 0x42, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0x80,
+  0x00, 0x00, 0xe4, 0xb0, 0x00, 0x08, 0xe4, 0xa0, 0x42, 0x00, 0x00, 0x03,
+  0x01, 0x00, 0x0f, 0x80, 0x01, 0x00, 0xe4, 0xb0, 0x01, 0x08, 0xe4, 0xa0,
+  0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0x80,
+  0x00, 0x00, 0xe4, 0x90, 0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0x80,
+  0x00, 0x00, 0xe4, 0x80, 0x01, 0x00, 0xe4, 0xa0, 0x01, 0x00, 0x00, 0x02,
+  0x00, 0x00, 0x17, 0x80, 0x00, 0x00, 0xe4, 0x80, 0x12, 0x00, 0x00, 0x04,
+  0x02, 0x00, 0x07, 0x80, 0x00, 0x00, 0xaa, 0xb0, 0x00, 0x00, 0xe4, 0x80,
+  0x00, 0x00, 0xe4, 0xa0, 0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x07, 0x80,
+  0x00, 0x00, 0xff, 0x80, 0x02, 0x00, 0xe4, 0x80, 0x05, 0x00, 0x00, 0x03,
+  0x01, 0x00, 0x07, 0x80, 0x01, 0x00, 0xe4, 0x80, 0x00, 0x00, 0xaa, 0xb0,
+  0x05, 0x00, 0x00, 0x03, 0x02, 0x00, 0x01, 0x80, 0x01, 0x00, 0xff, 0x80,
+  0x02, 0x00, 0x00, 0xa0, 0x01, 0x00, 0x00, 0x02, 0x03, 0x00, 0x08, 0x80,
+  0x02, 0x00, 0x00, 0xa0, 0x04, 0x00, 0x00, 0x04, 0x01, 0x00, 0x08, 0x80,
+  0x01, 0x00, 0xff, 0x80, 0x03, 0x00, 0xff, 0x81, 0x03, 0x00, 0x00, 0xa0,
+  0x04, 0x00, 0x00, 0x04, 0x03, 0x00, 0x08, 0x80, 0x00, 0x00, 0xff, 0x80,
+  0x01, 0x00, 0xff, 0x80, 0x02, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00, 0x04,
+  0x03, 0x00, 0x07, 0x80, 0x02, 0x00, 0x00, 0x80, 0x01, 0x00, 0xe4, 0x80,
+  0x00, 0x00, 0xe4, 0x80, 0x01, 0x00, 0x00, 0x02, 0x00, 0x08, 0x0f, 0x80,
+  0x03, 0x00, 0xe4, 0x80, 0xff, 0xff, 0x00, 0x00
+};

src/extras/shaders/obj/leedsDefault_ENV_VS.inc

@@ -1,4 +1,4 @@
-static unsigned char leedsVehicle_VS_cso[] = {
+static unsigned char leedsDefault_ENV_VS_cso[] = {
   0x00, 0x02, 0xfe, 0xff, 0xfe, 0xff, 0x8d, 0x00, 0x43, 0x54, 0x41, 0x42,
   0x1c, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x02, 0xfe, 0xff,
   0x0a, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,

src/extras/shaders/obj/leedsDefault_frag.inc

@@ -1,31 +1,47 @@
-const char *leedsVehicle_blend_frag_src =
+const char *leedsDefault_frag_src =
 "uniform sampler2D tex0;\n"
 "uniform sampler2D tex1;\n"
 
 "uniform float u_fxparams;\n"
+"uniform vec4 u_colorscale;\n"
 
 "#define shininess (u_fxparams)\n"
 
 "FSIN vec4 v_color;\n"
 "FSIN vec2 v_tex0;\n"
+"#if defined(PASS_BLEND) || defined(PASS_ADD)\n"
 "FSIN vec2 v_tex1;\n"
+"#endif\n"
 "FSIN float v_fog;\n"
 
 "void\n"
 "main(void)\n"
 "{\n"
-"	vec4 pass1 = v_color*texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y));\n"
+"	vec4 pass1 = v_color*texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y))*u_colorscale;\n"
+"	pass1.rgb = clamp(pass1.rgb, 0.0, 1.0);\n"
+"	pass1.rgb = mix(u_fogColor.rgb, pass1.rgb, v_fog);\n"
+
+"	vec4 color;\n"
+"#if defined(PASS_BLEND) || defined(PASS_ADD)\n"
 "	vec4 pass2 = texture(tex1, vec2(v_tex1.x, 1.0-v_tex1.y));\n"
 "	pass2.a *= shininess;\n"
-
-"	pass1.rgb = mix(u_fogColor.rgb, pass1.rgb, v_fog);\n"
 "	pass2.rgb = mix(vec3(0.0, 0.0, 0.0), pass2.rgb, v_fog);\n"
 
 "	// We simulate drawing this in two passes.\n"
+"#if defined(PASS_ADD)\n"
+"	// First pass with standard blending, second with addition\n"
+"	// We premultiply alpha so render state should be one.\n"
+"	color.rgb = pass1.rgb*pass1.a + pass2.rgb*pass2.a;\n"
+"	color.a = pass1.a;\n"
+"#elif defined(PASS_BLEND)\n"
 "	// We premultiply alpha so render state should be one.\n"
-"	vec4 color;\n"
 "	color.rgb = pass1.rgb*pass1.a*(1.0-pass2.a) + pass2.rgb*pass2.a;\n"
 "	color.a = pass1.a*(1.0-pass2.a) + pass2.a;\n"
+"#endif\n"
+
+"#else\n"
+"	color = pass1;\n"
+"#endif\n"
 
 "	DoAlphaTest(color.a);\n"
 

src/extras/shaders/obj/leedsDefault_vert.inc

@@ -0,0 +1,53 @@
+const char *leedsDefault_vert_src =
+"#ifdef ENVMAP\n"
+"uniform mat4 u_texMatrix;\n"
+"#endif\n"
+"#ifdef SKIN\n"
+"uniform mat4 u_boneMatrices[64];\n"
+"#endif\n"
+
+"VSIN(ATTRIB_POS)	vec3 in_pos;\n"
+
+"VSOUT vec4 v_color;\n"
+"VSOUT vec2 v_tex0;\n"
+"#ifdef ENVMAP\n"
+"VSOUT vec2 v_tex1;\n"
+"#endif\n"
+"VSOUT float v_fog;\n"
+
+"void\n"
+"main(void)\n"
+"{\n"
+"#ifdef SKIN\n"
+"	vec3 SkinVertex = vec3(0.0, 0.0, 0.0);\n"
+"	vec3 SkinNormal = vec3(0.0, 0.0, 0.0);\n"
+"	for(int i = 0; i < 4; i++){\n"
+"		SkinVertex += (u_boneMatrices[int(in_indices[i])] * vec4(in_pos, 1.0)).xyz * in_weights[i];\n"
+"		SkinNormal += (mat3(u_boneMatrices[int(in_indices[i])]) * in_normal) * in_weights[i];\n"
+"	}\n"
+
+"	vec4 Vertex = u_world * vec4(SkinVertex, 1.0);\n"
+"	gl_Position = u_proj * u_view * Vertex;\n"
+"	vec3 Normal = mat3(u_world) * SkinNormal;\n"
+"#else\n"
+"	vec4 Vertex = u_world * vec4(in_pos, 1.0);\n"
+"	gl_Position = u_proj * u_view * Vertex;\n"
+"	vec3 Normal = mat3(u_world) * in_normal;\n"
+"#endif\n"
+
+"	v_tex0 = in_tex0;\n"
+"#ifdef ENVMAP\n"
+"	v_tex1 = (u_texMatrix * vec4(Normal, 1.0)).xy;\n"
+"#endif\n"
+
+"	v_color = in_color;\n"
+"	v_color.rgb += u_ambLight.rgb*surfAmbient;\n"
+"	v_color.rgb += DoDynamicLight(Vertex.xyz, Normal)*surfDiffuse;\n"
+"	// PS2 clamps before material color\n"
+"	// PSP clamps after...maybe another constant for this?\n"
+"	v_color = clamp(v_color, 0.0, 1.0);\n"
+"	v_color *= u_matColor;\n"
+
+"	v_fog = DoFog(gl_Position.w);\n"
+"}\n"
+;

src/extras/shaders/obj/leedsVehicle_mobile_PS.inc

@@ -7,11 +7,11 @@ static unsigned char leedsVehicle_mobile_PS_cso[] = {
   0xac, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x06, 0x00,
   0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00,
   0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0xd0, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00,
-  0x01, 0x00, 0x06, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x0a, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xe9, 0x00, 0x00, 0x00, 0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x0e, 0x00,
+  0xe9, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x01, 0x00, 0x12, 0x00,
   0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-  0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x0a, 0x00, 0xf0, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x0e, 0x00, 0xf0, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x64, 0x69, 0x66, 0x66, 0x54, 0x65, 0x78, 0x00,
   0x04, 0x00, 0x0c, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x65, 0x6e, 0x76, 0x54, 0x65, 0x78, 0x00, 0xab,
@@ -27,7 +27,7 @@ static unsigned char leedsVehicle_mobile_PS_cso[] = {
   0x20, 0x53, 0x68, 0x61, 0x64, 0x65, 0x72, 0x20, 0x43, 0x6f, 0x6d, 0x70,
   0x69, 0x6c, 0x65, 0x72, 0x20, 0x39, 0x2e, 0x32, 0x39, 0x2e, 0x39, 0x35,
   0x32, 0x2e, 0x33, 0x31, 0x31, 0x31, 0x00, 0xab, 0x51, 0x00, 0x00, 0x05,
-  0x04, 0x00, 0x0f, 0xa0, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x80, 0xbf,
+  0x01, 0x00, 0x0f, 0xa0, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x80, 0xbf,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x05,
   0x05, 0x00, 0x0f, 0xa0, 0x00, 0x00, 0x30, 0x40, 0x00, 0x00, 0x80, 0x3e,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x02,
@@ -38,13 +38,13 @@ static unsigned char leedsVehicle_mobile_PS_cso[] = {
   0x00, 0x00, 0x00, 0x90, 0x00, 0x08, 0x0f, 0xa0, 0x1f, 0x00, 0x00, 0x02,
   0x00, 0x00, 0x00, 0x90, 0x01, 0x08, 0x0f, 0xa0, 0x42, 0x00, 0x00, 0x03,
   0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0xb0, 0x00, 0x08, 0xe4, 0xa0,
-  0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x07, 0x80, 0x03, 0x00, 0xe4, 0xa0,
+  0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x07, 0x80, 0x04, 0x00, 0xe4, 0xa0,
   0x02, 0x00, 0x00, 0x03, 0x01, 0x00, 0x07, 0x80, 0x01, 0x00, 0xe4, 0x81,
-  0x02, 0x00, 0xe4, 0xa0, 0x04, 0x00, 0x00, 0x04, 0x02, 0x00, 0x03, 0x80,
+  0x03, 0x00, 0xe4, 0xa0, 0x04, 0x00, 0x00, 0x04, 0x02, 0x00, 0x03, 0x80,
-  0x01, 0x00, 0xe4, 0xb0, 0x04, 0x00, 0xe4, 0xa0, 0x04, 0x00, 0xd2, 0xa0,
+  0x01, 0x00, 0xe4, 0xb0, 0x01, 0x00, 0xe4, 0xa0, 0x01, 0x00, 0xd2, 0xa0,
   0x42, 0x00, 0x00, 0x03, 0x02, 0x00, 0x0f, 0x80, 0x02, 0x00, 0xe4, 0x80,
   0x01, 0x08, 0xe4, 0xa0, 0x04, 0x00, 0x00, 0x04, 0x01, 0x00, 0x07, 0x80,
-  0x02, 0x00, 0x55, 0x80, 0x01, 0x00, 0xe4, 0x80, 0x03, 0x00, 0xe4, 0xa0,
+  0x02, 0x00, 0x55, 0x80, 0x01, 0x00, 0xe4, 0x80, 0x04, 0x00, 0xe4, 0xa0,
   0x12, 0x00, 0x00, 0x04, 0x03, 0x00, 0x07, 0x80, 0x02, 0x00, 0xaa, 0x80,
   0x01, 0x00, 0xe4, 0x80, 0x02, 0x00, 0x00, 0x80, 0x05, 0x00, 0x00, 0x03,
   0x03, 0x00, 0x08, 0x80, 0x02, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, 0xb0,
@@ -53,7 +53,7 @@ static unsigned char leedsVehicle_mobile_PS_cso[] = {
   0x03, 0x00, 0xff, 0x80, 0x05, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x55, 0xa0,
   0x05, 0x00, 0x00, 0x03, 0x03, 0x00, 0x08, 0x80, 0x03, 0x00, 0xff, 0x80,
   0x02, 0x00, 0x55, 0xb0, 0x05, 0x00, 0x00, 0x03, 0x03, 0x00, 0x08, 0x80,
-  0x03, 0x00, 0xff, 0x80, 0x01, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x00, 0x03,
+  0x03, 0x00, 0xff, 0x80, 0x02, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x00, 0x03,
   0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0x80, 0x00, 0x00, 0xe4, 0x90,
   0x04, 0x00, 0x00, 0x04, 0x01, 0x00, 0x07, 0x80, 0x03, 0x00, 0xff, 0x80,
   0x03, 0x00, 0xe4, 0x80, 0x00, 0x00, 0xe4, 0x80, 0x12, 0x00, 0x00, 0x04,

src/extras/shaders/obj/scale_PS.inc

@@ -22,12 +22,10 @@ static unsigned char scale_PS_cso[] = {
   0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x90, 0x00, 0x08, 0x0f, 0xa0,
   0x42, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0xb0,
   0x00, 0x08, 0xe4, 0xa0, 0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0x80,
-  0x00, 0x00, 0xe4, 0x80, 0x00, 0x00, 0xe4, 0x90, 0x01, 0x00, 0x00, 0x02,
+  0x00, 0x00, 0xe4, 0x80, 0x01, 0x00, 0xe4, 0xa0, 0x05, 0x00, 0x00, 0x03,
-  0x01, 0x00, 0x07, 0x80, 0x00, 0x00, 0xe4, 0xa0, 0x04, 0x00, 0x00, 0x04,
+  0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0x80, 0x00, 0x00, 0xe4, 0x90,
-  0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0xe4, 0x80, 0x01, 0x00, 0xe4, 0xa0,
+  0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x17, 0x80, 0x00, 0x00, 0xe4, 0x80,
-  0x01, 0x00, 0xe4, 0x81, 0x05, 0x00, 0x00, 0x03, 0x01, 0x00, 0x08, 0x80,
+  0x12, 0x00, 0x00, 0x04, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0xaa, 0xb0,
-  0x00, 0x00, 0xff, 0x80, 0x01, 0x00, 0xff, 0xa0, 0x04, 0x00, 0x00, 0x04,
+  0x01, 0x00, 0xe4, 0x80, 0x00, 0x00, 0xe4, 0xa0, 0x01, 0x00, 0x00, 0x02,
-  0x01, 0x00, 0x07, 0x80, 0x00, 0x00, 0xaa, 0xb0, 0x00, 0x00, 0xe4, 0x80,
+  0x00, 0x08, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0x80, 0xff, 0xff, 0x00, 0x00
-  0x00, 0x00, 0xe4, 0xa0, 0x01, 0x00, 0x00, 0x02, 0x00, 0x08, 0x0f, 0x80,
-  0x01, 0x00, 0xe4, 0x80, 0xff, 0xff, 0x00, 0x00
 };

src/extras/shaders/obj/scale_frag.inc

@@ -11,6 +11,7 @@ const char *scale_frag_src =
 "{\n"
 "	vec4 color;\n"
 "	color = v_color*texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y))*u_colorscale;\n"
+"	color.rgb = clamp(color.rgb, 0.0, 1.0);\n"
 "	color.rgb = mix(u_fogColor.rgb, color.rgb, v_fog);\n"
 "	DoAlphaTest(color.a);\n"
 

src/extras/shaders/scale.frag

@@ -10,6 +10,7 @@ main(void)
 {
 	vec4 color;
 	color = v_color*texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y))*u_colorscale;
+	color.rgb = clamp(color.rgb, 0.0, 1.0);
 	color.rgb = mix(u_fogColor.rgb, color.rgb, v_fog);
 	DoAlphaTest(color.a);
 

src/extras/shaders/scale_PS.hlsl

@@ -12,8 +12,8 @@ float4 colorscale : register(c1);
 float4 main(VS_out input) : COLOR
 {
 	float4 color = input.Color;
-	color *= tex2D(tex0, input.TexCoord0.xy);
+	color *= tex2D(tex0, input.TexCoord0.xy)*colorscale;
-	color *= colorscale;
+	color.rgb = clamp(color.rgb, 0.0, 1.0);
 	color.rgb = lerp(fogColor.rgb, color.rgb, input.TexCoord0.z);
 	return color;
 }

src/fakerw/fake.cpp

@@ -411,6 +411,9 @@ void RwIm2DVertexSetRecipCameraZ(RwIm2DVertex *vert, RwReal recipz) { vert->setR
 void RwIm2DVertexSetScreenX(RwIm2DVertex *vert, RwReal scrnx) { vert->setScreenX(scrnx); }
 void RwIm2DVertexSetScreenY(RwIm2DVertex *vert, RwReal scrny) { vert->setScreenY(scrny); }
 void RwIm2DVertexSetScreenZ(RwIm2DVertex *vert, RwReal scrnz) { vert->setScreenZ(scrnz); }
+float RwIm2DVertexGetScreenX(RwIm2DVertex *vert) { return vert->getScreenX(); }
+float RwIm2DVertexGetScreenY(RwIm2DVertex *vert) { return vert->getScreenY(); }
+float RwIm2DVertexGetScreenZ(RwIm2DVertex *vert) { return vert->getScreenZ(); }
 void RwIm2DVertexSetU(RwIm2DVertex *vert, RwReal texU, RwReal recipz) { vert->setU(texU, recipz); }
 void RwIm2DVertexSetV(RwIm2DVertex *vert, RwReal texV, RwReal recipz) { vert->setV(texV, recipz); }
 void RwIm2DVertexSetIntRGBA(RwIm2DVertex *vert, RwUInt8 red, RwUInt8 green, RwUInt8 blue, RwUInt8 alpha) { vert->setColor(red, green, blue, alpha); }

src/fakerw/rwcore.h

@@ -34,6 +34,9 @@ void RwIm2DVertexSetRecipCameraZ(RwIm2DVertex *vert, RwReal recipz);
 void RwIm2DVertexSetScreenX(RwIm2DVertex *vert, RwReal scrnx);
 void RwIm2DVertexSetScreenY(RwIm2DVertex *vert, RwReal scrny);
 void RwIm2DVertexSetScreenZ(RwIm2DVertex *vert, RwReal scrnz);
+float RwIm2DVertexGetScreenX(RwIm2DVertex *vert);
+float RwIm2DVertexGetScreenY(RwIm2DVertex *vert);
+float RwIm2DVertexGetScreenZ(RwIm2DVertex *vert);
 void RwIm2DVertexSetU(RwIm2DVertex *vert, RwReal texU, RwReal recipz);
 void RwIm2DVertexSetV(RwIm2DVertex *vert, RwReal texV, RwReal recipz);
 void RwIm2DVertexSetIntRGBA(RwIm2DVertex *vert, RwUInt8 red, RwUInt8 green, RwUInt8 blue, RwUInt8 alpha);

src/vehicles/Automobile.cpp

@@ -1345,7 +1345,7 @@ CAutomobile::ProcessCarWheelPair(int leftWheel, int rightWheel, float steerAngle
 		suspensionBias = 2.0f*(1.0f-pHandling->fSuspensionBias);
 
 		float fwdSpeed = DotProduct(m_vecMoveSpeed, GetForward());	
-		if(bIsHandbrakeOn && Abs(fwdSpeed) > 0.1f){
+		if(bIsHandbrakeOn && Abs(fwdSpeed) > 0.01f){
 #ifdef FIX_BUGS
 			// Not sure if this is needed, but brake usually has timestep as a factor
 			brake = 20000.0f * CTimer::GetTimeStepFix();

vendor/librw

@@ -1 +1 @@
-Subproject commit 61b288a9fe72ae4073c0ac5fd2a5815ed510c8c8
+Subproject commit 78d540fce0ca090b07377cee40d73eadfb7a699d