merge

desktopRuntime/eclipseProject/.classpath

@@ -7,17 +7,17 @@
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/CompileEPK.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/Java-WebSocket-1.5.1-with-dependencies.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/MakeOfflineDownload.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/codecjorbis-20101023.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/codecwav-20101023.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-egl.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-glfw.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-jemalloc.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-openal.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-opengles.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/soundsystem-20120107.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/CompileEPK.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/Java-WebSocket-1.5.1-with-dependencies.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/MakeOfflineDownload.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/codecjorbis-20101023.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/codecwav-20101023.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl-egl.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl-glfw.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl-jemalloc.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl-openal.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl-opengles.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/soundsystem-20120107.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

desktopRuntime/eclipseProject/.project

@@ -18,12 +18,12 @@
 		<link>
 			<name>src_lwjgl_java</name>
 			<type>2</type>
-			<location>/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/src/lwjgl/java</location>
+			<location>/workspace/Resent-1.8/eaglercraftx/src/lwjgl/java</location>
 		</link>
 		<link>
 			<name>src_main_java</name>
 			<type>2</type>
-			<location>/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/src/main/java</location>
+			<location>/workspace/Resent-1.8/eaglercraftx/src/main/java</location>
 		</link>
 	</linkedResources>
 </projectDescription>

desktopRuntime/eclipseProject/eaglercraftDebugRuntime.launch

@@ -18,5 +18,5 @@
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="eclipseProject"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="eclipseProject"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.library.path=."/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/workspace/Resent-1.8/eaglercraftx/desktopRuntime"/>
 </launchConfiguration>

desktopRuntime/resources/assets/eagler/glsl/accel_font.fsh

@@ -15,13 +15,13 @@
  */
 
 precision lowp int;
-precision highp float;
+precision lowp float;
 precision lowp sampler2D;
 
 in vec2 v_texCoord2f;
 in vec4 v_color4f;
 
-out vec4 output4f;
+layout(location = 0) out vec4 output4f;
 
 uniform sampler2D u_inputTexture;
 uniform vec4 u_colorBias4f;

desktopRuntime/resources/assets/eagler/glsl/accel_font.vsh

@@ -15,14 +15,14 @@
  */
 
 precision lowp int;
-precision highp float;
+precision lowp float;
 precision lowp sampler2D;
 
-in vec3 a_position3f;
+layout(location = 0) in vec3 a_position3f;
 
-in vec2 c_position2i;
-in vec2 c_coords2i;
-in vec4 c_color4f;
+layout(location = 1) in vec2 c_position2i;
+layout(location = 2) in vec2 c_coords2i;
+layout(location = 3) in vec4 c_color4f;
 
 out vec2 v_texCoord2f;
 out vec4 v_color4f;

desktopRuntime/resources/assets/eagler/glsl/accel_particle.fsh

@@ -15,13 +15,13 @@
  */
 
 precision lowp int;
-precision highp float;
-precision highp sampler2D;
+precision lowp float;
+precision lowp sampler2D;
 
 in vec2 v_texCoord2f;
 in vec4 v_color4f;
 
-out vec4 output4f;
+layout(location = 0) out vec4 output4f;
 
 uniform sampler2D u_inputTexture;
 

desktopRuntime/resources/assets/eagler/glsl/accel_particle.vsh

@@ -15,16 +15,16 @@
  */
 
 precision lowp int;
-precision highp float;
+precision lowp float;
 precision lowp sampler2D;
 
-in vec2 a_position2f;
+layout(location = 0) in vec2 a_position2f;
 
-in vec3 p_position3f;
-in vec2 p_texCoords2i;
-in vec2 p_lightMap2f;
-in vec2 p_particleSize_texCoordsSize_2i;
-in vec4 p_color4f;
+layout(location = 1) in vec3 p_position3f;
+layout(location = 2) in vec2 p_texCoords2i;
+layout(location = 3) in vec2 p_lightMap2f;
+layout(location = 4) in vec2 p_particleSize_texCoordsSize_2i;
+layout(location = 5) in vec4 p_color4f;
 
 out vec2 v_texCoord2f;
 out vec4 v_color4f;

desktopRuntime/resources/assets/eagler/glsl/core.fsh

@@ -87,7 +87,7 @@ uniform mat4 u_textureMat4f01;
 uniform vec2 u_textureAnisotropicFix;
 #endif
 
-out vec4 output4f;
+layout(location = 0) out vec4 output4f;
 
 void main() {
 

desktopRuntime/resources/assets/eagler/glsl/local.vsh

@@ -18,7 +18,7 @@ precision lowp int;
 precision lowp float;
 precision lowp sampler2D;
 
-in vec2 a_position2f;
+layout(location = 0) in vec2 a_position2f;
 
 out vec2 v_position2f;
 

desktopRuntime/resources/assets/eagler/glsl/post_fxaa.fsh

@@ -47,12 +47,12 @@
  */
 
 precision lowp int;
-precision highp float;
-precision highp sampler2D;
+precision mediump float;
+precision lowp sampler2D;
 
 in vec2 v_position2f;
 
-out vec4 output4f;
+layout(location = 0) out vec4 output4f;
 
 uniform sampler2D u_screenTexture;
 uniform vec2 u_screenSize2f;

desktopRuntime/resources/assets/eagler/glsl/texture_mix.fsh

@@ -15,12 +15,12 @@
  */
 
 precision lowp int;
-precision highp float;
+precision lowp float;
 precision lowp sampler2D;
 
 in vec2 v_position2f;
 
-out vec4 output4f;
+layout(location = 0) out vec4 output4f;
 
 uniform sampler2D u_inputTexture;
 uniform float u_textureLod1f;