diff options
| author | Ray <[email protected]> | 2017-10-23 22:05:27 +0200 |
|---|---|---|
| committer | Ray <[email protected]> | 2017-10-23 22:05:27 +0200 |
| commit | 6a3005e0c8738912465bf9fc12f6f5b9caa3a73f (patch) | |
| tree | 0affe4dcf032f55b70131ac55e70055e7ce5c8a5 /examples/web | |
| parent | b5a254452af9acaea801fafa50253f96893e246e (diff) | |
| download | raylib.com-6a3005e0c8738912465bf9fc12f6f5b9caa3a73f.tar.gz raylib.com-6a3005e0c8738912465bf9fc12f6f5b9caa3a73f.zip | |
Updated, corrected some issues
Diffstat (limited to 'examples/web')
| -rw-r--r-- | examples/web/shaders/resources/shaders/glsl100/base.vs | 4 | ||||
| -rw-r--r-- | examples/web/shaders/resources/shaders/glsl100/swirl.fs | 12 | ||||
| -rw-r--r-- | examples/web/shaders/shaders_custom_uniform.data | 16 | ||||
| -rw-r--r-- | examples/web/shaders/shaders_custom_uniform.js | 2 | ||||
| -rw-r--r-- | examples/web/shaders/shaders_model_shader.data | 4 | ||||
| -rw-r--r-- | examples/web/shaders/shaders_model_shader.js | 2 | ||||
| -rw-r--r-- | examples/web/shaders/shaders_postprocessing.data | 4 | ||||
| -rw-r--r-- | examples/web/shaders/shaders_postprocessing.js | 2 | ||||
| -rw-r--r-- | examples/web/shaders/shaders_shapes_textures.data | bin | 220504 -> 220492 bytes | |||
| -rw-r--r-- | examples/web/shaders/shaders_shapes_textures.js | 2 |
10 files changed, 24 insertions, 24 deletions
diff --git a/examples/web/shaders/resources/shaders/glsl100/base.vs b/examples/web/shaders/resources/shaders/glsl100/base.vs index e938693..4be76b9 100644 --- a/examples/web/shaders/resources/shaders/glsl100/base.vs +++ b/examples/web/shaders/resources/shaders/glsl100/base.vs @@ -7,7 +7,7 @@ attribute vec3 vertexNormal; attribute vec4 vertexColor; // Input uniform values -uniform mat4 mvpMatrix; +uniform mat4 mvp; // Output vertex attributes (to fragment shader) varying vec2 fragTexCoord; @@ -22,5 +22,5 @@ void main() fragColor = vertexColor; // Calculate final vertex position - gl_Position = mvpMatrix*vec4(vertexPosition, 1.0); + gl_Position = mvp*vec4(vertexPosition, 1.0); }
\ No newline at end of file diff --git a/examples/web/shaders/resources/shaders/glsl100/swirl.fs b/examples/web/shaders/resources/shaders/glsl100/swirl.fs index b969aab..cdcdba3 100644 --- a/examples/web/shaders/resources/shaders/glsl100/swirl.fs +++ b/examples/web/shaders/resources/shaders/glsl100/swirl.fs @@ -13,16 +13,16 @@ uniform vec4 colDiffuse; // NOTE: Add here your custom variables // NOTE: Render size values should be passed from code -const float renderWidth = 800; -const float renderHeight = 450; - -float radius = 250.0; -float angle = 0.8; - uniform vec2 center; void main() { + float renderWidth = 800.0; + float renderHeight = 450.0; + + float radius = 250.0; + float angle = 0.8; + vec2 texSize = vec2(renderWidth, renderHeight); vec2 tc = fragTexCoord*texSize; tc -= center; diff --git a/examples/web/shaders/shaders_custom_uniform.data b/examples/web/shaders/shaders_custom_uniform.data index 3aaa405..3655659 100644 --- a/examples/web/shaders/shaders_custom_uniform.data +++ b/examples/web/shaders/shaders_custom_uniform.data @@ -60396,7 +60396,7 @@ attribute vec3 vertexNormal; attribute vec4 vertexColor;
// Input uniform values
-uniform mat4 mvpMatrix;
+uniform mat4 mvp;
// Output vertex attributes (to fragment shader)
varying vec2 fragTexCoord;
@@ -60411,7 +60411,7 @@ void main() fragColor = vertexColor;
// Calculate final vertex position
- gl_Position = mvpMatrix*vec4(vertexPosition, 1.0);
+ gl_Position = mvp*vec4(vertexPosition, 1.0);
}#version 100
precision mediump float;
@@ -60427,16 +60427,16 @@ uniform vec4 colDiffuse; // NOTE: Add here your custom variables
// NOTE: Render size values should be passed from code
-const float renderWidth = 800;
-const float renderHeight = 450;
-
-float radius = 250.0;
-float angle = 0.8;
-
uniform vec2 center;
void main()
{
+ float renderWidth = 800.0;
+ float renderHeight = 450.0;
+
+ float radius = 250.0;
+ float angle = 0.8;
+
vec2 texSize = vec2(renderWidth, renderHeight);
vec2 tc = fragTexCoord*texSize;
tc -= center;
diff --git a/examples/web/shaders/shaders_custom_uniform.js b/examples/web/shaders/shaders_custom_uniform.js index df6ddcf..e8b0094 100644 --- a/examples/web/shaders/shaders_custom_uniform.js +++ b/examples/web/shaders/shaders_custom_uniform.js @@ -185,7 +185,7 @@ Module['FS_createPath']('/resources/shaders', 'glsl100', true, true); } } - loadPackage({"files": [{"audio": 0, "start": 0, "crunched": 0, "end": 2748249, "filename": "/resources/model/dwarf.obj"}, {"audio": 0, "start": 2748249, "crunched": 0, "end": 4022872, "filename": "/resources/model/dwarf_diffuse.png"}, {"audio": 0, "start": 4022872, "crunched": 0, "end": 4023477, "filename": "/resources/shaders/glsl100/base.vs"}, {"audio": 0, "start": 4023477, "crunched": 0, "end": 4024518, "filename": "/resources/shaders/glsl100/swirl.fs"}], "remote_package_size": 4024518, "package_uuid": "35f9e39e-2fb2-4087-8420-91e1e6f0e6a6"}); + loadPackage({"files": [{"audio": 0, "start": 0, "crunched": 0, "end": 2748249, "filename": "/resources/model/dwarf.obj"}, {"audio": 0, "start": 2748249, "crunched": 0, "end": 4022872, "filename": "/resources/model/dwarf_diffuse.png"}, {"audio": 0, "start": 4022872, "crunched": 0, "end": 4023465, "filename": "/resources/shaders/glsl100/base.vs"}, {"audio": 0, "start": 4023465, "crunched": 0, "end": 4024514, "filename": "/resources/shaders/glsl100/swirl.fs"}], "remote_package_size": 4024514, "package_uuid": "e04b7f14-184b-4967-90ed-9341c3e8057e"}); })(); diff --git a/examples/web/shaders/shaders_model_shader.data b/examples/web/shaders/shaders_model_shader.data index 825b8cc..70b5cdb 100644 --- a/examples/web/shaders/shaders_model_shader.data +++ b/examples/web/shaders/shaders_model_shader.data @@ -60396,7 +60396,7 @@ attribute vec3 vertexNormal; attribute vec4 vertexColor;
// Input uniform values
-uniform mat4 mvpMatrix;
+uniform mat4 mvp;
// Output vertex attributes (to fragment shader)
varying vec2 fragTexCoord;
@@ -60411,7 +60411,7 @@ void main() fragColor = vertexColor;
// Calculate final vertex position
- gl_Position = mvpMatrix*vec4(vertexPosition, 1.0);
+ gl_Position = mvp*vec4(vertexPosition, 1.0);
}#version 100
precision mediump float;
diff --git a/examples/web/shaders/shaders_model_shader.js b/examples/web/shaders/shaders_model_shader.js index 69bc058..85f32cc 100644 --- a/examples/web/shaders/shaders_model_shader.js +++ b/examples/web/shaders/shaders_model_shader.js @@ -185,7 +185,7 @@ Module['FS_createPath']('/resources/shaders', 'glsl100', true, true); } } - loadPackage({"files": [{"audio": 0, "start": 0, "crunched": 0, "end": 2748249, "filename": "/resources/model/dwarf.obj"}, {"audio": 0, "start": 2748249, "crunched": 0, "end": 4022872, "filename": "/resources/model/dwarf_diffuse.png"}, {"audio": 0, "start": 4022872, "crunched": 0, "end": 4023477, "filename": "/resources/shaders/glsl100/base.vs"}, {"audio": 0, "start": 4023477, "crunched": 0, "end": 4024142, "filename": "/resources/shaders/glsl100/grayscale.fs"}], "remote_package_size": 4024142, "package_uuid": "3e369581-a002-4e04-a268-48ca37a6ee4c"}); + loadPackage({"files": [{"audio": 0, "start": 0, "crunched": 0, "end": 2748249, "filename": "/resources/model/dwarf.obj"}, {"audio": 0, "start": 2748249, "crunched": 0, "end": 4022872, "filename": "/resources/model/dwarf_diffuse.png"}, {"audio": 0, "start": 4022872, "crunched": 0, "end": 4023465, "filename": "/resources/shaders/glsl100/base.vs"}, {"audio": 0, "start": 4023465, "crunched": 0, "end": 4024130, "filename": "/resources/shaders/glsl100/grayscale.fs"}], "remote_package_size": 4024130, "package_uuid": "f3c8d826-ae04-47d4-9582-0e97d145347c"}); })(); diff --git a/examples/web/shaders/shaders_postprocessing.data b/examples/web/shaders/shaders_postprocessing.data index cfd99db..1c9c0c9 100644 --- a/examples/web/shaders/shaders_postprocessing.data +++ b/examples/web/shaders/shaders_postprocessing.data @@ -60419,7 +60419,7 @@ attribute vec3 vertexNormal; attribute vec4 vertexColor;
// Input uniform values
-uniform mat4 mvpMatrix;
+uniform mat4 mvp;
// Output vertex attributes (to fragment shader)
varying vec2 fragTexCoord;
@@ -60434,7 +60434,7 @@ void main() fragColor = vertexColor;
// Calculate final vertex position
- gl_Position = mvpMatrix*vec4(vertexPosition, 1.0);
+ gl_Position = mvp*vec4(vertexPosition, 1.0);
}#version 100
precision mediump float;
diff --git a/examples/web/shaders/shaders_postprocessing.js b/examples/web/shaders/shaders_postprocessing.js index 66e9d89..f9d35bf 100644 --- a/examples/web/shaders/shaders_postprocessing.js +++ b/examples/web/shaders/shaders_postprocessing.js @@ -185,7 +185,7 @@ Module['FS_createPath']('/resources/shaders', 'glsl100', true, true); } } - loadPackage({"files": [{"audio": 0, "start": 0, "crunched": 0, "end": 2748249, "filename": "/resources/model/dwarf.obj"}, {"audio": 0, "start": 2748249, "crunched": 0, "end": 4022872, "filename": "/resources/model/dwarf_diffuse.png"}, {"audio": 0, "start": 4022872, "crunched": 0, "end": 4023423, "filename": "/resources/shaders/glsl100/base.fs"}, {"audio": 0, "start": 4023423, "crunched": 0, "end": 4024028, "filename": "/resources/shaders/glsl100/base.vs"}, {"audio": 0, "start": 4024028, "crunched": 0, "end": 4025108, "filename": "/resources/shaders/glsl100/bloom.fs"}, {"audio": 0, "start": 4025108, "crunched": 0, "end": 4026178, "filename": "/resources/shaders/glsl100/blur.fs"}, {"audio": 0, "start": 4026178, "crunched": 0, "end": 4027346, "filename": "/resources/shaders/glsl100/cross_hatching.fs"}, {"audio": 0, "start": 4027346, "crunched": 0, "end": 4028771, "filename": "/resources/shaders/glsl100/cross_stitching.fs"}, {"audio": 0, "start": 4028771, "crunched": 0, "end": 4030960, "filename": "/resources/shaders/glsl100/distortion.fs"}, {"audio": 0, "start": 4030960, "crunched": 0, "end": 4032107, "filename": "/resources/shaders/glsl100/dream_vision.fs"}, {"audio": 0, "start": 4032107, "crunched": 0, "end": 4033036, "filename": "/resources/shaders/glsl100/fisheye.fs"}, {"audio": 0, "start": 4033036, "crunched": 0, "end": 4033701, "filename": "/resources/shaders/glsl100/grayscale.fs"}, {"audio": 0, "start": 4033701, "crunched": 0, "end": 4034444, "filename": "/resources/shaders/glsl100/pixelizer.fs"}, {"audio": 0, "start": 4034444, "crunched": 0, "end": 4035073, "filename": "/resources/shaders/glsl100/posterization.fs"}, {"audio": 0, "start": 4035073, "crunched": 0, "end": 4035815, "filename": "/resources/shaders/glsl100/predator.fs"}, {"audio": 0, "start": 4035815, "crunched": 0, "end": 4036935, "filename": "/resources/shaders/glsl100/scanlines.fs"}, {"audio": 0, "start": 4036935, "crunched": 0, "end": 4038578, "filename": "/resources/shaders/glsl100/sobel.fs"}, {"audio": 0, "start": 4038578, "crunched": 0, "end": 4039619, "filename": "/resources/shaders/glsl100/swirl.fs"}], "remote_package_size": 4039619, "package_uuid": "0235db60-784b-43a0-9a85-65b957d00cac"}); + loadPackage({"files": [{"audio": 0, "start": 0, "crunched": 0, "end": 2748249, "filename": "/resources/model/dwarf.obj"}, {"audio": 0, "start": 2748249, "crunched": 0, "end": 4022872, "filename": "/resources/model/dwarf_diffuse.png"}, {"audio": 0, "start": 4022872, "crunched": 0, "end": 4023423, "filename": "/resources/shaders/glsl100/base.fs"}, {"audio": 0, "start": 4023423, "crunched": 0, "end": 4024016, "filename": "/resources/shaders/glsl100/base.vs"}, {"audio": 0, "start": 4024016, "crunched": 0, "end": 4025096, "filename": "/resources/shaders/glsl100/bloom.fs"}, {"audio": 0, "start": 4025096, "crunched": 0, "end": 4026166, "filename": "/resources/shaders/glsl100/blur.fs"}, {"audio": 0, "start": 4026166, "crunched": 0, "end": 4027334, "filename": "/resources/shaders/glsl100/cross_hatching.fs"}, {"audio": 0, "start": 4027334, "crunched": 0, "end": 4028759, "filename": "/resources/shaders/glsl100/cross_stitching.fs"}, {"audio": 0, "start": 4028759, "crunched": 0, "end": 4030948, "filename": "/resources/shaders/glsl100/distortion.fs"}, {"audio": 0, "start": 4030948, "crunched": 0, "end": 4032095, "filename": "/resources/shaders/glsl100/dream_vision.fs"}, {"audio": 0, "start": 4032095, "crunched": 0, "end": 4033024, "filename": "/resources/shaders/glsl100/fisheye.fs"}, {"audio": 0, "start": 4033024, "crunched": 0, "end": 4033689, "filename": "/resources/shaders/glsl100/grayscale.fs"}, {"audio": 0, "start": 4033689, "crunched": 0, "end": 4034432, "filename": "/resources/shaders/glsl100/pixelizer.fs"}, {"audio": 0, "start": 4034432, "crunched": 0, "end": 4035061, "filename": "/resources/shaders/glsl100/posterization.fs"}, {"audio": 0, "start": 4035061, "crunched": 0, "end": 4035803, "filename": "/resources/shaders/glsl100/predator.fs"}, {"audio": 0, "start": 4035803, "crunched": 0, "end": 4036923, "filename": "/resources/shaders/glsl100/scanlines.fs"}, {"audio": 0, "start": 4036923, "crunched": 0, "end": 4038566, "filename": "/resources/shaders/glsl100/sobel.fs"}, {"audio": 0, "start": 4038566, "crunched": 0, "end": 4039607, "filename": "/resources/shaders/glsl100/swirl.fs"}], "remote_package_size": 4039607, "package_uuid": "56031192-b25d-4375-94bd-5769262b8343"}); })(); diff --git a/examples/web/shaders/shaders_shapes_textures.data b/examples/web/shaders/shaders_shapes_textures.data Binary files differindex 32c1acf..58b924a 100644 --- a/examples/web/shaders/shaders_shapes_textures.data +++ b/examples/web/shaders/shaders_shapes_textures.data diff --git a/examples/web/shaders/shaders_shapes_textures.js b/examples/web/shaders/shaders_shapes_textures.js index 5245858..afe226e 100644 --- a/examples/web/shaders/shaders_shapes_textures.js +++ b/examples/web/shaders/shaders_shapes_textures.js @@ -184,7 +184,7 @@ Module['FS_createPath']('/resources/shaders', 'glsl100', true, true); } } - loadPackage({"files": [{"audio": 0, "start": 0, "crunched": 0, "end": 219234, "filename": "/resources/fudesumi.png"}, {"audio": 0, "start": 219234, "crunched": 0, "end": 219839, "filename": "/resources/shaders/glsl100/base.vs"}, {"audio": 0, "start": 219839, "crunched": 0, "end": 220504, "filename": "/resources/shaders/glsl100/grayscale.fs"}], "remote_package_size": 220504, "package_uuid": "08616fcd-ba0d-4214-9679-fdacd0c13946"}); + loadPackage({"files": [{"audio": 0, "start": 0, "crunched": 0, "end": 219234, "filename": "/resources/fudesumi.png"}, {"audio": 0, "start": 219234, "crunched": 0, "end": 219827, "filename": "/resources/shaders/glsl100/base.vs"}, {"audio": 0, "start": 219827, "crunched": 0, "end": 220492, "filename": "/resources/shaders/glsl100/grayscale.fs"}], "remote_package_size": 220492, "package_uuid": "4caa2262-ea8d-402a-9094-fa538499d023"}); })(); |
