From c1a6cacf364d79cbf23b41e7089a1a6d39afea85 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Tue, 10 Apr 2012 10:12:49 -0700 Subject: Cloud material --- assets/shaders/Cloud.frag.glsl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 assets/shaders/Cloud.frag.glsl (limited to 'assets/shaders/Cloud.frag.glsl') diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl new file mode 100644 index 00000000..522e17bb --- /dev/null +++ b/assets/shaders/Cloud.frag.glsl @@ -0,0 +1,23 @@ +/* +This file contains proprietary software owned by Motorola Mobility, Inc.
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. + */ + + +#ifdef GL_ES +precision highp float; +#endif + +uniform sampler2D u_tex0; +uniform float u_surfaceAlpha; + +varying vec4 v_Colors; +varying vec2 v_texCoord0; + + +void main() +{ + gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha; +} + \ No newline at end of file -- cgit v1.2.3 From 331b2ad4d602016f9bb3d03be759fd81fed50c10 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Fri, 13 Apr 2012 07:08:42 -0700 Subject: Cloud Material --- assets/shaders/Cloud.frag.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'assets/shaders/Cloud.frag.glsl') diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl index 522e17bb..b07bb627 100644 --- a/assets/shaders/Cloud.frag.glsl +++ b/assets/shaders/Cloud.frag.glsl @@ -12,12 +12,12 @@ precision highp float; uniform sampler2D u_tex0; uniform float u_surfaceAlpha; -varying vec4 v_Colors; varying vec2 v_texCoord0; void main() { - gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha; + // gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha; + gl_FragColor = vec4(1,0,0,1); } \ No newline at end of file -- cgit v1.2.3 From 8992d9baf542135e910bb59328a592d9e330703a Mon Sep 17 00:00:00 2001 From: hwc487 Date: Sun, 15 Apr 2012 05:16:34 -0700 Subject: Cloud Material --- assets/shaders/Cloud.frag.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'assets/shaders/Cloud.frag.glsl') diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl index b07bb627..ba1ef39e 100644 --- a/assets/shaders/Cloud.frag.glsl +++ b/assets/shaders/Cloud.frag.glsl @@ -17,7 +17,7 @@ varying vec2 v_texCoord0; void main() { - // gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha; - gl_FragColor = vec4(1,0,0,1); + gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha; + //gl_FragColor = texture2D(u_tex0, v_texCoord0); } \ No newline at end of file -- cgit v1.2.3 From c0aa5e88890fbf74124d019df96c33215da99f17 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Mon, 16 Apr 2012 05:59:01 -0700 Subject: Cloud material --- assets/shaders/Cloud.frag.glsl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'assets/shaders/Cloud.frag.glsl') diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl index ba1ef39e..c21dcf97 100644 --- a/assets/shaders/Cloud.frag.glsl +++ b/assets/shaders/Cloud.frag.glsl @@ -17,7 +17,8 @@ varying vec2 v_texCoord0; void main() { - gl_FragColor = texture2D(u_tex0, v_texCoord0) * u_surfaceAlpha; - //gl_FragColor = texture2D(u_tex0, v_texCoord0); + vec4 c = texture2D(u_tex0, v_texCoord0); + //c.a *= u_surfaceAlpha; + gl_FragColor = c; } \ No newline at end of file -- cgit v1.2.3 From 447268000c379f619c78d7132c81e23b5c252598 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Tue, 17 Apr 2012 09:20:49 -0700 Subject: Cloud material --- assets/shaders/Cloud.frag.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'assets/shaders/Cloud.frag.glsl') diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl index c21dcf97..3d466a24 100644 --- a/assets/shaders/Cloud.frag.glsl +++ b/assets/shaders/Cloud.frag.glsl @@ -18,7 +18,7 @@ varying vec2 v_texCoord0; void main() { vec4 c = texture2D(u_tex0, v_texCoord0); - //c.a *= u_surfaceAlpha; - gl_FragColor = c; + c.a *= u_surfaceAlpha; + gl_FragColor = c; } \ No newline at end of file -- cgit v1.2.3 From ae7eb87564632ce7c676bd728b8ff2710ff0bb83 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Wed, 18 Apr 2012 15:44:26 -0700 Subject: Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js --- assets/shaders/Cloud.frag.glsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'assets/shaders/Cloud.frag.glsl') diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl index 3d466a24..3f858b7a 100644 --- a/assets/shaders/Cloud.frag.glsl +++ b/assets/shaders/Cloud.frag.glsl @@ -18,7 +18,8 @@ varying vec2 v_texCoord0; void main() { vec4 c = texture2D(u_tex0, v_texCoord0); - c.a *= u_surfaceAlpha; + //c.a *= u_surfaceAlpha; + if ((c.r == 0.0) && (c.b == 0.0) && (c.g == 0.0) && (c.a == 1.0)) c = vec4( 0.0, 0.0, 1.0, 1.0 ); gl_FragColor = c; } \ No newline at end of file -- cgit v1.2.3 From 725c2175f20b5e0829518f725fd26cc077748bdf Mon Sep 17 00:00:00 2001 From: hwc487 Date: Fri, 25 May 2012 13:35:10 -0700 Subject: Parameters for twistVertex material --- assets/shaders/Cloud.frag.glsl | 2 -- 1 file changed, 2 deletions(-) (limited to 'assets/shaders/Cloud.frag.glsl') diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl index 2447fd79..cd70d1a0 100644 --- a/assets/shaders/Cloud.frag.glsl +++ b/assets/shaders/Cloud.frag.glsl @@ -18,8 +18,6 @@ varying vec2 v_texCoord0; void main() { vec4 c = texture2D(u_tex0, v_texCoord0); - //c.a *= u_surfaceAlpha; - //if ((c.r == 0.0) && (c.b == 0.0) && (c.g == 0.0) && (c.a == 1.0)) c = vec4( 0.0, 0.0, 1.0, 1.0 ); gl_FragColor = c; } \ No newline at end of file -- cgit v1.2.3