Merge pull request #11 from atsb/cleaner_polymost_removal

Cleaner polymost removal
atsb · Oct 8, 2024 · fd251a1 · fd251a1
2 parents ed91b73 + 3847a4e
commit fd251a1
Show file tree

Hide file tree

Showing 36 changed files with 286 additions and 3,734 deletions.
diff --git a/.idea/artifacts/NuBuildGDX_jar.xml b/.idea/artifacts/NuBuildGDX_jar.xml
diff --git a/.idea/libraries/lwjgl_opengl_3_2_3.xml b/.idea/libraries/lwjgl_opengl_3_2_3.xml
diff --git a/.idea/libraries/lwjgl_opengl_3_2_3_natives_windows.xml b/.idea/libraries/lwjgl_opengl_3_2_3_natives_windows.xml
diff --git a/NuBuildGDX.iml b/NuBuildGDX.iml
@@ -18,8 +18,6 @@
     <orderEntry type="library" name="lwjgl-3.2.3" level="project" />
     <orderEntry type="library" name="lwjgl-glfw-3.2.3-natives-windows" level="project" />
     <orderEntry type="library" name="lwjgl-glfw-3.2.3" level="project" />
-    <orderEntry type="library" name="lwjgl-opengl-3.2.3-natives-windows" level="project" />
-    <orderEntry type="library" name="lwjgl-opengl-3.2.3" level="project" />
     <orderEntry type="library" name="jinput-2.6" level="project" />
   </component>
 </module>
diff --git a/libs/lwjgl-opengl-3.2.3-natives-linux.jar b/libs/lwjgl-opengl-3.2.3-natives-linux.jar
diff --git a/libs/lwjgl-opengl-3.2.3-natives-windows.jar b/libs/lwjgl-opengl-3.2.3-natives-windows.jar
diff --git a/libs/lwjgl-opengl-3.2.3.jar b/libs/lwjgl-opengl-3.2.3.jar
diff --git a/src/ru/m210projects/Blood/Factory/BloodFactory.java b/src/ru/m210projects/Blood/Factory/BloodFactory.java
@@ -62,10 +62,7 @@ public BuildEngine engine() throws Exception {
 
 	@Override
 	public Renderer renderer(RenderType type) {
-		if (type == RenderType.Software)
-			return new BloodSoftware(app.pEngine);
-		else
-			return new BloodPolymost(app.pEngine);
+		return new BloodSoftware(app.pEngine);
 	}
 
 	@Override

diff --git a/src/ru/m210projects/Blood/Factory/BloodPolymost.java b/src/ru/m210projects/Blood/Factory/BloodPolymost.java
diff --git a/src/ru/m210projects/Blood/View.java b/src/ru/m210projects/Blood/View.java
@@ -886,25 +886,6 @@ public static void viewDrawScreen(int gViewIndex, int smooth) {
 			engine.getzsofslope(nSector, (int) x, (int) y, zofslope);
 			int lz = 4 << 8;
 			long crossDz = 0;
-			if (z < zofslope[CEIL] + lz) {
-				if (nLower == -1 || (engine.getrender().getType().equals(RenderType.Polymost) // Polymost zNear Plane
-																								// tweak
-						&& sector[nSector].ceilingpicnum < MIRRORLABEL
-						|| sector[nSector].ceilingpicnum >= MIRRORLABEL + MAXMIRRORS)) {
-					crossDz = z;
-					z = zofslope[CEIL] + lz;
-					crossDz -= z;
-				}
-			}
-			if (z > zofslope[FLOOR] - lz) {
-				if (nUpper == -1 || (engine.getrender().getType().equals(RenderType.Polymost)
-						&& sector[nSector].floorpicnum < MIRRORLABEL
-						|| sector[nSector].floorpicnum >= MIRRORLABEL + MAXMIRRORS)) {
-					crossDz = z;
-					z = zofslope[FLOOR] - lz;
-					crossDz -= z;
-				}
-			}
 
 			nHoriz = BClipRange(nHoriz, -200, 200);
 			int defHoriz = kHorizDefault;

diff --git a/src/ru/m210projects/Build/Pattern/CommonMenus/MenuVideoMode.java b/src/ru/m210projects/Build/Pattern/CommonMenus/MenuVideoMode.java
@@ -238,24 +238,21 @@ public void run() {
 						MenuConteiner item = (MenuConteiner) pItem;
 						switch(item.num) {
 							case 0: choosedRender = RenderType.Software; break;
-							case 1: choosedRender = RenderType.Polymost; break;
 						}
 					}
 				});
 			}
 		};
 
 		String[] renderers = new String[] {
-			RenderType.Software.getName(),
-			RenderType.Polymost.getName()
+			RenderType.Software.getName()
 		};
 		mRenderer = new MenuConteiner("Renderer", style, posx, posy += itemHeight, width, renderers, 0, renderCallback) {
 			@Override
 			public void open() {
 				choosedRender = currentRender = app.pEngine.getrender().getType();
 				switch(currentRender) {
 					case Software: num = 0; break;
-					case Polymost: num = 1; break;
 				}
 			}
 		};

diff --git a/src/ru/m210projects/Build/Render/Polymost/Polymost.java b/src/ru/m210projects/Build/Render/Polymost/Polymost.java
@@ -592,6 +592,11 @@ public void setDefs(DefScript defs) {
 		this.defs = defs;
 	}
 
+	@Override
+	public RenderType getType() {
+		return RenderType.Software;
+	}
+
 	//
 	// invalidatetile
 	// pal: pass -1 to invalidate all palettes for the tile, or >=0 for a particular
@@ -4093,11 +4098,6 @@ protected Polymost2D allocOrphoRenderer(IOverheadMapSettings settings) {
 		return new Polymost2D(this, settings);
 	}
 
-	@Override
-	public RenderType getType() {
-		return RenderType.Polymost;
-	}
-
 	@Override
 	public PixelFormat getTexFormat() {
 		return PixelFormat.Rgb; // textureCache.getShader() != null ? PixelFormat.Pal8 : PixelFormat.Rgb;