Fix #13, merge #14, #15

Triang3l · Aug 7, 2014 · 5608e1b · 5608e1b
1 parent 1a812cb
commit 5608e1b
Show file tree

Hide file tree

Showing 4 changed files with 1,276 additions and 1,272 deletions.
diff --git a/Client/WebQuake/Def.js b/Client/WebQuake/Def.js
@@ -1,7 +1,7 @@
 Def = {};
 
-Def.webquake_version = 47;
-Def.timedate = 'Exe: 21:19:52 Mar  6 2014\n';
+Def.webquake_version = 48;
+Def.timedate = 'Exe: 12:39:20 Aug  7 2014\n';
 
 Def.max_edicts = 600;
 

diff --git a/Client/WebQuake/GL.js b/Client/WebQuake/GL.js
@@ -116,10 +116,10 @@ GL.Upload = function(data, width, height)
 		scaled_height |= (scaled_height >> 16);
 		++scaled_height;
 	}
-	if (scaled_width > 1024)
-		scaled_width = 1024;
-	if (scaled_height > 1024)
-		scaled_height = 1024;
+	if (scaled_width > GL.maxtexturesize)
+		scaled_width = GL.maxtexturesize;
+	if (scaled_height > GL.maxtexturesize)
+		scaled_height = GL.maxtexturesize;
 	if ((scaled_width !== width) || (scaled_height !== height))
 		data = GL.ResampleTexture(data, width, height, scaled_width, scaled_height);
 	var trans = new ArrayBuffer((scaled_width * scaled_height) << 2)
@@ -172,10 +172,10 @@ GL.LoadTexture = function(identifier, width, height, data)
 		scaled_height |= (scaled_height >> 16);
 		++scaled_height;
 	}
-	if (scaled_width > 1024)
-		scaled_width = 1024;
-	if (scaled_height > 1024)
-		scaled_height = 1024;
+	if (scaled_width > GL.maxtexturesize)
+		scaled_width = GL.maxtexturesize;
+	if (scaled_height > GL.maxtexturesize)
+		scaled_height = GL.maxtexturesize;
 	scaled_width >>= GL.picmip.value;
 	if (scaled_width === 0)
 		scaled_width = 1;
@@ -212,10 +212,10 @@ GL.LoadPicTexture = function(pic)
 		scaled_height |= (scaled_height >> 16);
 		++scaled_height;
 	}
-	if (scaled_width > 1024)
-		scaled_width = 1024;
-	if (scaled_height > 1024)
-		scaled_height = 1024;
+	if (scaled_width > GL.maxtexturesize)
+		scaled_width = GL.maxtexturesize;
+	if (scaled_height > GL.maxtexturesize)
+		scaled_height = GL.maxtexturesize;
 	if ((scaled_width !== pic.width) || (scaled_height !== pic.height))
 		data = GL.ResampleTexture(data, pic.width, pic.height, scaled_width, scaled_height);
 
@@ -349,6 +349,8 @@ GL.Init = function()
 	if (gl == null)
 		Sys.Error('Unable to initialize WebGL. Your browser may not support it.');
 
+	GL.maxtexturesize = gl.getParameter(gl.MAX_TEXTURE_SIZE);
+
 	gl.clearColor(0.0, 0.0, 0.0, 0.0);
 	gl.cullFace(gl.FRONT);
 	gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE);

diff --git a/Client/WebQuake/IN.js b/Client/WebQuake/IN.js
@@ -18,7 +18,7 @@ IN.StartupMouse = function()
 		IN.requestPointerLock = 'webkitRequestPointerLock';
 		IN.pointerlockchange = 'onwebkitpointerlockchange';
 	}
-	if (VID.mainwindow.mozRequestPointerLock != null)
+	else if (VID.mainwindow.mozRequestPointerLock != null)
 	{
 		IN.movementX = 'mozMovementX';
 		IN.movementY = 'mozMovementY';