fixed water drops a bit; added clipping call to default pipe

aap · May 10, 2019 · 9700158 · 9700158
1 parent 8034caa
commit 9700158
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -936,7 +936,7 @@ patch(void)
 	if(isVC())
 		InjectHook(AddressByVersion<addr>(0, 0, 0, 0x55EA39, 0x55EA59, 0x55E929), sniperTrailsHook, PATCH_JUMP);
 
-	config.neowaterdrops = readint(cfg.get("SkyGfx", "neoWaterDrops", ""));
+	config.neowaterdrops = readint(cfg.get("SkyGfx", "neoWaterDrops", ""), -1);
 	if(config.neowaterdrops >= 0)
 		hookWaterDrops();
 

diff --git a/src/matfx.cpp b/src/matfx.cpp
@@ -459,6 +459,14 @@ _rpMatFXD3D8AtomicMatFXEnvRender_ps2_shader(RxD3D8InstanceData *inst, int flags,
 	// Env pass
 	MatFX *matfx = *RWPLUGINOFFSET(MatFX*, inst->material, MatFXMaterialDataOffset);
 	MatFXEnv *env = &matfx->fx[sel].e;
+#ifdef DEBUG
+env->envCoeff *= envmult;
+// simulate broken filtering
+if(ps2filtering)
+	envMap->filterAddressing = texture == nil ? 0x1101 : texture->filterAddressing;
+else
+	envMap->filterAddressing = 0x1102;
+#endif
 	ApplyEnvMapTextureMatrix_world(envMap, 0, env->envFrame);
 	void *lightingShader = config.ps2light ? ps2StandardEnvOnlyVS : pcStandardEnvOnlyVS;
 	RwD3D9SetVertexShader(flags&rpGEOMETRYLIGHT ? lightingShader : nolightEnvOnlyVS);

diff --git a/src/neoWaterdrops.cpp b/src/neoWaterdrops.cpp
@@ -298,7 +298,7 @@ getParticleDistance(int id)
 		case III_PARTICLE_RAIN_SPLASHUP:	return 5.0f;
 		case III_PARTICLE_WATERSPRAY:		return 20.0f;
 		case III_PARTICLE_CAR_SPLASH:		return 5.0f;
-		case III_PARTICLE_BOAT_SPLASH:		return 30.0f;
+		case III_PARTICLE_BOAT_SPLASH:		return 40.0f;
 		case III_PARTICLE_BOAT_THRUSTJET:	return 20.0f;
 		case III_PARTICLE_BOAT_WAKE:		return 20.0f;
 		case III_PARTICLE_WATER_HYDRANT:	return 10.0f;
@@ -324,7 +324,7 @@ getParticleDistance(int id)
 		case VC_PARTICLE_WATERDROP:		return 20.0f;
 		case VC_PARTICLE_BLOODDROP:		return 5.0f;
 		case VC_PARTICLE_CAR_SPLASH:		return 12.0f;
-		case VC_PARTICLE_BOAT_SPLASH:		return 30.0f;
+		case VC_PARTICLE_BOAT_SPLASH:		return 40.0f;
 		case VC_PARTICLE_BOAT_THRUSTJET:	return 20.0f;
 		case VC_PARTICLE_WATER_HYDRANT:		return 10.0f;
 		case VC_PARTICLE_WATER_CANNON:		return 20.0f;

diff --git a/src/rwfix.cpp b/src/rwfix.cpp
@@ -403,6 +403,8 @@ rxD3D8SetAmbientLight(void)
 void
 rxD3D8DefaultRenderCallback_xbox(RwResEntry *repEntry, void *object, RwUInt8 type, RwUInt32 flags)
 {
+	_rwD3D8EnableClippingIfNeeded(object, type);
+
 	rxD3D8SetAmbientLight();
 
 	RxD3D8ResEntryHeader *header = (RxD3D8ResEntryHeader*)&repEntry[1];