3.0 release

aap · Dec 12, 2018 · 2f75bd3 · 2f75bd3
1 parent 1bd7cd0
commit 2f75bd3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/src/leeds.cpp b/src/leeds.cpp
@@ -150,7 +150,8 @@ leedsWorldRenderCallback_shader(RwResEntry *repEntry, void *object, RwUInt8 type
 			// unused actually, but maybe we wanna use it later
 			memcpy(surfProps, &inst->material->surfaceProps, sizeof(inst->material->surfaceProps));
 			// scale down emissive
-			surfProps[3] = 128.0f/255.0f;
+			surfProps[3] = 0.5f;
+//			surfProps[3] = 1.22f;	// PSP
 			RwD3D9SetVertexShaderConstant(LOC_surfProps, surfProps, 1);
 			RwRGBARealFromRwRGBA(&color, &inst->material->color);
 			RwD3D9SetVertexShaderConstant(LOC_matCol, &color, 1);

diff --git a/src/main.cpp b/src/main.cpp
@@ -966,19 +966,6 @@ patch(void)
 		}
 	}
 
-/*
-	// load xbox flames
-	if(gtaversion == III_10){
-		InjectHook(0x50C8D3, neoflame_hook_iii, PATCH_JUMP);
-		Patch(0x50CB0E + 6, flameras);
-		Patch(0x50CBA4 + 6, flameras);
-	}else if(gtaversion == VC_10){
-		InjectHook(0x565226, neoflame_hook_vc, PATCH_JUMP);
-		Patch(0x5655C7 + 6, flameras);
-		Patch(0x565671 + 6, flameras);
-	}
-*/
-
 	ScreenFX::m_bYCbCrFilter = readint(cfg.get("SkyGfx", "YCbCrCorrection", ""), 0);
 	ScreenFX::m_lumaScale = readfloat(cfg.get("SkyGfx", "lumaScale", ""), 219.0f/255.0f);
 	ScreenFX::m_lumaOffset = readfloat(cfg.get("SkyGfx", "lumaOffset", ""), 16.0f/255.0f);

diff --git a/src/neoWaterdrops.cpp b/src/neoWaterdrops.cpp
@@ -228,8 +228,9 @@ void
 RenderEffects_hook(void)
 {
 	RenderEffects();
-	WaterDrops::Process();
-	WaterDrops::Render();
+		WaterDrops::Process();
+	if(config.neowaterdrops)
+		WaterDrops::Render();
 }
 
 /* For extended droplets */

diff --git a/src/postfx.cpp b/src/postfx.cpp
@@ -103,6 +103,8 @@ CMBlur::Initialise(void)
 		}
 }
 
+/* PS2 code. frame*blurcolour is added to frame, equivalent to multiplication by 255+blurcolour, i.e. it can only brighten.
+ * LCS PSP multiplies final frame with 255-blurcolour, i.e. it can only darken. */
 void
 CMBlur::OverlayRender_leeds(RwCamera *cam, RwRaster *frontbuf, RwRGBA *col, uint8 type)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,6 +103,8 @@ CMBlur::Initialise(void) @@
     		}
     }
+    /* PS2 code. frame*blurcolour is added to frame, equivalent to multiplication by 255+blurcolour, i.e. it can only brighten.
+     * LCS PSP multiplies final frame with 255-blurcolour, i.e. it can only darken. */
     void
     CMBlur::OverlayRender_leeds(RwCamera *cam, RwRaster *frontbuf, RwRGBA *col, uint8 type)
     {
@@ Expand Down @@