- [Psy-X] fix building with PGXP completely disabled

src_rebuild/DebugOverlay.cpp

@@ -155,7 +155,9 @@ void Debug_Line2D(SXYPAIR& pointA, SXYPAIR& pointB, CVECTOR& color)
 	line->g0 = color.g;
 	line->b0 = color.b;
 
+#ifdef PGXP
 	line->pgxp_index = 0xFFFF;
+#endif
 
 	addPrim(current->ot, line);
 

src_rebuild/GAME/C/OVERLAY.H

@@ -23,6 +23,8 @@ extern void SetFullscreenDrawing(); // 0x00015E70
 extern void InitPercentageBar(PERCENTAGE_BAR *bar, int size, COLOUR_BAND *pColourBand, char *tag); // 0x00015F20
 extern void EnablePercentageBar(PERCENTAGE_BAR *bar, int max); // 0x00015F58
 
+extern void DrawProximityBar(PERCENTAGE_BAR* bar);
+
 extern void SetColourByValue(COLOUR_BAND *pColourBand, int value, CVECTOR *pOut); // 0x00015F6C
 extern void TransparencyOn(void *potz, unsigned short tpage); // 0x00016098
 

src_rebuild/PsyX/EMULATOR.C

@@ -71,6 +71,7 @@ KeyboardMapping g_keyboard_mapping;
 // without clamping
 inline void ScreenCoordsToEmulator(Vertex* vertex, int count)
 {
+#ifdef PGXP
 	while (count--)
 	{
 		float psxScreenW = activeDispEnv.disp.w;
@@ -84,6 +85,7 @@ inline void ScreenCoordsToEmulator(Vertex* vertex, int count)
 		vertex[count].x -= 0.5f;
 		vertex[count].y -= 0.5f;
 	}
+#endif
 }
 
 void Emulator_ResetDevice()
@@ -1265,8 +1267,10 @@ void Emulator_CreateGlobalShaders()
 
 #if defined(OGL) || defined(OGLES)
 	u_Projection = glGetUniformLocation(g_gte_shader_4, "Projection");
+#ifdef PGXP
 	u_Projection3D = glGetUniformLocation(g_gte_shader_4, "Projection3D");
 #endif
+#endif
 }
 
 unsigned short vram[VRAM_WIDTH * VRAM_HEIGHT];
@@ -1397,7 +1401,7 @@ void Emulator_SetupClipMode(const RECT16& rect)
 		rect.y - activeDispEnv.disp.y > 0 ||
 		rect.w < activeDispEnv.disp.w - 1 ||
 		rect.h < activeDispEnv.disp.h - 1);
-
+	
 	float psxScreenW = activeDispEnv.disp.w;
 	float psxScreenH = activeDispEnv.disp.h;
 
@@ -1408,9 +1412,14 @@ void Emulator_SetupClipMode(const RECT16& rect)
 	float clipRectH = (float)(rect.h) / psxScreenH;
 
 	// then map to screen
+
 	{
 		clipRectX -= 0.5f;
+#ifdef PGXP
 		float emuScreenAspect = float(windowWidth) / float(windowHeight);
+#else
+		float emuScreenAspect = (320.0f / 240.0f);
+#endif
 
 		clipRectX /= PSX_SCREEN_ASPECT * emuScreenAspect;
 		clipRectW /= emuScreenAspect * PSX_SCREEN_ASPECT;
@@ -1437,6 +1446,7 @@ void Emulator_SetupClipMode(const RECT16& rect)
 
 void Emulator_GetPSXWidescreenMappedViewport(RECT16* rect)
 {
+#ifdef PGXP
 	float emuScreenAspect = float(windowWidth) / float(windowHeight);
 
 	float psxScreenW = activeDispEnv.disp.w;
@@ -1451,6 +1461,12 @@ void Emulator_GetPSXWidescreenMappedViewport(RECT16* rect)
 	rect->x -= (rect->w - activeDispEnv.disp.w) / 2;
 
 	rect->w += rect->x;
+#else
+	rect->x = activeDispEnv.screen.x;
+	rect->y = activeDispEnv.screen.y;
+	rect->w = activeDispEnv.disp.w;
+	rect->h = activeDispEnv.disp.h;
+#endif
 }
 
 void Emulator_SetShader(const ShaderID &shader)
@@ -1461,11 +1477,13 @@ void Emulator_SetShader(const ShaderID &shader)
 	#error
 #endif
 
+#ifdef PGXP
 	float emuScreenAspect = float(windowWidth) / float(windowHeight);
-
 	Emulator_Ortho2D(-0.5f * emuScreenAspect * PSX_SCREEN_ASPECT, 0.5f * emuScreenAspect * PSX_SCREEN_ASPECT, 0.5f, -0.5f, -1.0f, 1.0f);
-
 	Emulator_Perspective3D(0.9265f, 1.0f, 1.0f / (emuScreenAspect * PSX_SCREEN_ASPECT), 1.0f, 1000.0f);
+#else
+	Emulator_Ortho2D(0, activeDispEnv.disp.w, activeDispEnv.disp.h, 0, -1.0f, 1.0f);
+#endif
 }
 
 void Emulator_SetTexture(TextureID texture, TexFormat texFormat)

src_rebuild/PsyX/LIBGTE.C

@@ -642,7 +642,7 @@ int docop2(int op) {
 				C2_MAC0 = nclip;
 			}
 #else
-			MAC0 = int(F((long long)(SX0 * SY1) + (SX1 * SY2) + (SX2 * SY0) - (SX0 * SY2) - (SX1 * SY0) - (SX2 * SY1)));
+			C2_MAC0 = int(F((long long)(C2_SX0 * C2_SY1) + (C2_SX1 * C2_SY2) + (C2_SX2 * C2_SY0) - (C2_SX0 * C2_SY2) - (C2_SX1 * C2_SY0) - (C2_SX2 * C2_SY1)));
 #endif
 			C2_FLAG = 0;
 			return 1;