Skip to content

Commit 8629b92

Browse files
greggmanphemavax
greggman
authored and
phemavax
committed
fix colletibles
1 parent 2baeba4 commit 8629b92

13 files changed

+216
-202
lines changed

‎collectibles/compile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
22

3-
java -jar ${ClosureCompiler}/compiler.jar --js shader/collectibles_vshader.js --js shader/collectibles_fshader.js --js shader/lines_vshader.js --js shader/lines_fshader.js --js shader/screenQuad_vShader.js --js shader/screenQuad_fShader.js --js shader/depthMap_vShader.js --js shader/depthMap_fShader.js --js shader/shadow_vshader.js --js shader/shadow_fshader.js --js shader/radialBlur_vshader.js --js shader/radialBlur_fshader.js --js shader/shadowProj_vshader.js --js shader/shadowProj_fshader.js --js script/procs/MeshLoaders.js --js script/procs/RenderProcs.js --js script/procs/RenderInitProcs.js --js script/managers/CollisionManager.js --js script/managers/MeshManager.js --js script/managers/TextureManager.js --js script/managers/ShaderManager.js --js script/Mesh.js --js script/ScreenQuad.js --js script/webGLView.js --js script/webGLInterface.js --js script/CanvasMatrix.js --js script/utils3d.js --js script/vec3.js --js script/vec2.js --js script/vec4.js --js script/camera.js --js script/utilities.js --js script/input.js --js script/web/jquery.jcarousel.min.js --js script/web/ui_controls.js --js script/web/colorpicker/dhtml_colorpicker.js --js script/main.js --js script/web/url_utils.js --js_output_file script-compiled/collectibles.js
3+
java -jar ${ClosureCompiler}/compiler.jar --js shader/collectibles_vshader.js --js shader/collectibles_fshader.js --js shader/lines_vshader.js --js shader/lines_fshader.js --js shader/screenQuad_vshader.js --js shader/screenQuad_fshader.js --js shader/depthMap_vshader.js --js shader/depthMap_fshader.js --js shader/shadow_vshader.js --js shader/shadow_fshader.js --js shader/radialBlur_vshader.js --js shader/radialBlur_fshader.js --js shader/shadowProj_vshader.js --js shader/shadowProj_fshader.js --js script/procs/MeshLoaders.js --js script/procs/RenderProcs.js --js script/procs/RenderInitProcs.js --js script/managers/CollisionManager.js --js script/managers/MeshManager.js --js script/managers/TextureManager.js --js script/managers/ShaderManager.js --js script/Mesh.js --js script/ScreenQuad.js --js script/webGLView.js --js script/webGLInterface.js --js script/CanvasMatrix.js --js script/utils3d.js --js script/vec3.js --js script/vec2.js --js script/vec4.js --js script/camera.js --js script/utilities.js --js script/input.js --js script/web/jquery.jcarousel.min.js --js script/web/ui_controls.js --js script/web/colorpicker/dhtml_colorpicker.js --js script/main.js --js script/web/url_utils.js --js_output_file script-compiled/collectibles.js

‎collectibles/index-nocompile.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ <h2>Collectibles Painter Options</h2>
252252
<!-- ---------------------------------------------------------------------------------------------------- -->
253253

254254
<!-- JQuery Library hosted on Google -->
255-
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript" ></script>
256-
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.3/jquery-ui.min.js" type="text/javascript"></script>
255+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript" ></script>
256+
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.3/jquery-ui.min.js" type="text/javascript"></script>
257257
<script src="script/web/jquery.jcarousel.min.js" type="text/javascript"></script>
258258
<script src="script/web/ui_controls.js" type="text/javascript"></script>
259259
<script src="script/web/url_utils.js" type="text/javascript"></script>

‎collectibles/script-compiled/collectibles.js

Lines changed: 199 additions & 185 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎collectibles/script/managers/MeshManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ MeshManager.prototype.addOnLoadedCallback = function(callback)
160160

161161
MeshManager.prototype.onLoaded = function()
162162
{
163-
for(var index = 0 in this.postMeshLoadCallbackList)
163+
for(var index in this.postMeshLoadCallbackList)
164164
{
165165
// call the functions
166166
this.postMeshLoadCallbackList[index]();

‎collectibles/script/procs/RenderInitProcs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ function __renderInitRadialBlur(quad, shader)
276276
quad.renderObj.addUniform("u_inv_viewport_width", 1.0/g_width, UNIFORMTYPE.FLOAT);
277277
quad.renderObj.addUniform("u_inv_viewport_height", 1.0/g_height, UNIFORMTYPE.FLOAT);
278278
quad.renderObj.addUniform("u_sampRadius", 5.0, UNIFORMTYPE.FLOAT);
279-
quad.renderObj.addUniform("u_numSamples", 16, UNIFORMTYPE.INT);
279+
// quad.renderObj.addUniform("u_numSamples", 16, UNIFORMTYPE.INT);
280280
quad.renderObj.addUniform("u_mapSize", 256.0, UNIFORMTYPE.FLOAT);
281281

282282
quad.renderObj.addBuffers(quad.vertBuffer, gl.ARRAY_BUFFER, 3, 0, gl.FLOAT);

‎collectibles/script/utilities.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@ function loadShader(ctx, shaderType, shaderStr)
338338
if (!compiled) {
339339
// Something went wrong during compilation; get the error
340340
var error = ctx.getShaderInfoLog(shader);
341-
/*
341+
342342
ctx.console.log("*** Error compiling shader '"+shaderType+"':"+error);
343-
*/
343+
344344
ctx.deleteShader(shader);
345345
return null;
346346
}
@@ -380,9 +380,9 @@ function createShader(ctx, vShader, fShader, attribs)
380380
if (!linked) {
381381
// something went wrong with the link
382382
var error = ctx.getProgramInfoLog (program);
383-
/*
383+
384384
ctx.console.log("Error in program linking:"+error);
385-
*/
385+
386386

387387
ctx.deleteProgram(program);
388388
ctx.deleteProgram(fragmentShader);

‎collectibles/shader/collectibles_fshader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
var vortexFShader = [
2929

3030
"#ifdef GL_ES",
31-
"precision mediump float;",
31+
"precision highp float;",
3232
"#endif",
3333

3434
// layer textures (ie face, hair, or shirt pants)

‎collectibles/shader/depthMap_fshader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
var depthMapFShader = [
2929

3030
"#ifdef GL_ES",
31-
"precision mediump float;",
31+
"precision highp float;",
3232
"#endif",
3333
"varying vec4 vPos;",
3434

‎collectibles/shader/lines_fshader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
var linesFShader = [
3030
"#ifdef GL_ES",
31-
"precision mediump float;",
31+
"precision highp float;",
3232
"#endif",
3333
"uniform vec4 u_lineColor;",
3434
"void main()",

‎collectibles/shader/radialBlur_fshader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
var radialBlur_fshader = [
3030
"#ifdef GL_ES",
31-
"precision mediump float;",
31+
"precision highp float;",
3232
"#endif",
3333

3434
"vec2 poissonDisk[16];",
@@ -37,7 +37,7 @@ var radialBlur_fshader = [
3737
"uniform sampler2D basemap;",
3838
"uniform float u_mapSize;",
3939
"uniform float u_sampRadius;",
40-
"uniform int u_numSamples;",
40+
"const int u_numSamples = 16;",
4141

4242
"varying vec2 vTexcoord;", // tex coords
4343

0 commit comments

Comments
 (0)