some additions to GL convenience class, cleaning up some warnings and redundant code

Mumfrey
1 parent 11bcac00
Showing 5 changed files with 89 additions and 19 deletions
java/client/com/mumfrey/liteloader/gl/GL.java
java/common/com/mumfrey/liteloader/core/LiteLoader.java
java/common/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
java/common/com/mumfrey/liteloader/core/LiteLoaderUpdateSite.java
java/common/com/mumfrey/liteloader/launch/OperatingSystem.java
 package com.mumfrey.liteloader.gl;
+import java.nio.ByteBuffer;
+import java.nio.DoubleBuffer;
 import java.nio.FloatBuffer;
-
-import org.lwjgl.opengl.GL11;
+import java.nio.IntBuffer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.GlStateManager.TexGen;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.glu.GLU;
+
 /**
  * Convenience class for working with Mojang's GLStateManager:
  * 
@@ -854,6 +858,21 @@ public class GL
 		GlStateManager.disableLight(light); // TODO OBF MCPTEST disableBooleanStateAt - disableLight
 	}
+	public static void glLight(int light, int pname, FloatBuffer params)
+	{
+		GL11.glLight(light, pname, params);
+	}
+	
+	public static void glLightModel(int pname, FloatBuffer params)
+	{
+		GL11.glLightModel(pname, params);
+	}
+	
+	public static void glLightModeli(int pname, int param)
+	{
+		GL11.glLightModeli(pname, param);
+	}
+	
 	public static void glEnableColorMaterial()
 	{
 		GlStateManager.enableColorMaterial();
@@ -939,6 +958,21 @@ public class GL
 		GlStateManager.setFogEnd(end);
 	}
+	public static void glSetFogColour(FloatBuffer colour)
+	{
+		GL11.glFog(GL_FOG_COLOR, colour);
+	}
+	
+	public static void glFogi(int pname, int param)
+	{
+		GL11.glFogi(pname, param);
+	}
+	
+	public static void glFogf(int pname, float param)
+	{
+		GL11.glFogf(pname, param);
+	}
+	
 	public static void glEnableCulling()
 	{
 		GlStateManager.enableCull();
@@ -1024,7 +1058,7 @@ public class GL
 		return GlStateManager.generateTexture(); // TODO OBF MCPTEST func_179146_y - generateTexture
 	}
-	public static void glDeleteTexture(int textureName)
+	public static void glDeleteTextures(int textureName)
 	{
 		GlStateManager.deleteTexture(textureName); // TODO OBF MCPTEST func_179150_h - deleteTexture
 	}
@@ -1109,6 +1143,51 @@ public class GL
 		GlStateManager.getFloat(pname, params);
 	}
+	public static float glGetFloat(int pname)
+	{
+		return GL11.glGetFloat(pname);
+	}
+	
+	public static void glGetDouble(int pname, DoubleBuffer params)
+	{
+		GL11.glGetDouble(pname, params);
+	}
+	
+	public static double glGetDouble(int pname)
+	{
+		return GL11.glGetDouble(pname);
+	}
+
+	public static void glGetInteger(int pname, IntBuffer params)
+	{
+		GL11.glGetInteger(pname, params);
+	}
+	
+	public static int glGetInteger(int pname)
+	{
+		return GL11.glGetInteger(pname);
+	}
+
+	public static void glGetBoolean(int pname, ByteBuffer params)
+	{
+		GL11.glGetBoolean(pname, params);
+	}
+	
+	public static boolean glGetBoolean(int pname)
+	{
+		return GL11.glGetBoolean(pname);
+	}
+	
+	public static void gluProject(float objx, float objy, float objz, FloatBuffer modelMatrix, FloatBuffer projMatrix, IntBuffer viewport, FloatBuffer win_pos)
+	{
+		GLU.gluProject(objx, objy, objz, modelMatrix, projMatrix, viewport, win_pos);
+	}
+	
+	public static void gluPerspective(float fovy, float aspect, float zNear, float zFar)
+	{
+		GLU.gluPerspective(fovy, aspect, zNear, zFar);
+	}
+
 	public static void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar)
 	{
 		GlStateManager.ortho(left, right, bottom, top, zNear, zFar);
@@ -1119,6 +1198,11 @@ public class GL
 		GlStateManager.rotate(angle, x, y, z);
 	}
+	public static void glRotated(double angle, double x, double y, double z)
+	{
+		GL11.glRotated(angle, x, y, z);
+	}
+	
 	public static void glScalef(float x, float y, float z)
 	{
 		GlStateManager.scale(x, y, z);
@@ -595,7 +595,7 @@ public final class LiteLoader
 	 * @throws InvalidActivityException Thrown by getMod if init is not complete 
 	 * @throws IllegalArgumentException Thrown by getMod if argument is null
 	 */
-	public String getModMetaData(String modNameOrId, String metaDataKey, String defaultValue) throws InvalidActivityException, IllegalArgumentException
+	public String getModMetaData(String modNameOrId, String metaDataKey, String defaultValue) throws IllegalArgumentException
 	{
 		return this.mods.getModMetaData(modNameOrId, metaDataKey, defaultValue);
 	}
@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.lang.reflect.Field;
@@ -373,7 +372,7 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	 * @throws SecurityException
 	 * @throws IOException
 	 */
-	private void prepareLogger() throws SecurityException, IOException
+	private void prepareLogger() throws SecurityException
 	{
 		LiteLoaderLogger.info("Setting up logger...");
@@ -41,7 +41,6 @@ public class LiteLoaderUpdateSite extends UpdateSite
 			return false;
 		}
-		// TODO Enable force update
 		if (this.hasJarFile()) return true;
 		return this.findJarFile();
 	}
@@ -107,7 +106,6 @@ public class LiteLoaderUpdateSite extends UpdateSite
 		{
 			LiteLoaderLogger.info("Attempting to force update, extracting jar assassin...");
-			// TODO Enable force update
 			File jarAssassinOutput = new File(this.jarFile.getParentFile(), "liteloader-update-agent.jar");
 			if (!LiteLoaderUpdateSite.extractFile("/update/liteloader-update-agent.jar", jarAssassinOutput) || !jarAssassinOutput.isFile())
-package com.mumfrey.liteloader.launch;
-
-public class OperatingSystem
-{
-	
-	public OperatingSystem()
-	{
-		// TODO Auto-generated constructor stub
-	}
-	
-}