From 5d37b914e158eef8f8dc85060083f9c7092455a9 Mon Sep 17 00:00:00 2001 From: "Sha..rd" Date: Sat, 14 Apr 2012 20:19:13 +0000 Subject: [PATCH] * Removed deprecated material definitions git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9315 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../Common/MatDefs/Misc/SimpleTextured.frag | 27 ------------ .../Common/MatDefs/Misc/SimpleTextured.j3md | 32 -------------- .../Common/MatDefs/Misc/SimpleTextured.vert | 11 ----- .../Common/MatDefs/Misc/SolidColor.j3md | 44 ------------------- .../Common/MatDefs/Misc/VertexColor.j3md | 18 -------- .../Common/MatDefs/Misc/WireColor.j3md | 38 ---------------- 6 files changed, 170 deletions(-) delete mode 100644 engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.frag delete mode 100644 engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.j3md delete mode 100644 engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.vert delete mode 100644 engine/src/core-data/Common/MatDefs/Misc/SolidColor.j3md delete mode 100644 engine/src/core-data/Common/MatDefs/Misc/VertexColor.j3md delete mode 100644 engine/src/core-data/Common/MatDefs/Misc/WireColor.j3md diff --git a/engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.frag b/engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.frag deleted file mode 100644 index 395f3d181..000000000 --- a/engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.frag +++ /dev/null @@ -1,27 +0,0 @@ -#import "Common/ShaderLib/Texture.glsllib" - -varying vec2 texCoord; - -uniform sampler2D m_ColorMap; - -void main(){ - //Texture_GetColor(m_ColorMap, texCoord) - //vec4 color = texture2D(m_ColorMap, texCoord); - //color.rgb *= color.a; - //gl_FragColor = vec4(color.a); - - #ifdef NORMAL_LATC - vec3 newNorm = vec3(texture2D(m_ColorMap, texCoord).ag, 0.0); - newNorm = Common_UnpackNormal(newNorm); - newNorm.b = sqrt(1.0 - (newNorm.x * newNorm.x) - (newNorm.y * newNorm.y)); - newNorm = Common_PackNormal(newNorm); - gl_FragColor = vec4(newNorm, 1.0); - #elif defined(SHOW_ALPHA) - gl_FragColor = vec4(texture2D(m_ColorMap, texCoord).a); - #else - gl_FragColor = Texture_GetColor(m_ColorMap, texCoord); - #endif - #ifdef NORMALIZE - gl_FragColor = vec4(normalize(gl_FragColor.xyz), gl_FragColor.a); - #endif -} \ No newline at end of file diff --git a/engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.j3md b/engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.j3md deleted file mode 100644 index 53469e2eb..000000000 --- a/engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.j3md +++ /dev/null @@ -1,32 +0,0 @@ -Exception SimpleTextured.j3md has been marked as obsolete. Please use Unshaded.j3md instead. - -MaterialDef Plain Texture { - - MaterialParameters { - Texture2D ColorMap - Boolean YCoCg - Boolean LATC - Boolean Normalize - Boolean ShowAlpha - } - - Technique { - VertexShader GLSL100: Common/MatDefs/Misc/SimpleTextured.vert - FragmentShader GLSL100: Common/MatDefs/Misc/SimpleTextured.frag - - WorldParameters { - WorldViewProjectionMatrix - } - - Defines { - DXT_YCOCG : YCoCg - NORMAL_LATC : LATC - NORMALIZE : Normalize - SHOW_ALPHA : ShowAlpha - } - } - - Technique FixedFunc { - } - -} \ No newline at end of file diff --git a/engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.vert b/engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.vert deleted file mode 100644 index 572d84191..000000000 --- a/engine/src/core-data/Common/MatDefs/Misc/SimpleTextured.vert +++ /dev/null @@ -1,11 +0,0 @@ -uniform mat4 g_WorldViewProjectionMatrix; - -attribute vec3 inPosition; -attribute vec2 inTexCoord; - -varying vec2 texCoord; - -void main(){ - gl_Position = g_WorldViewProjectionMatrix * vec4(inPosition, 1.0); - texCoord = inTexCoord; -} \ No newline at end of file diff --git a/engine/src/core-data/Common/MatDefs/Misc/SolidColor.j3md b/engine/src/core-data/Common/MatDefs/Misc/SolidColor.j3md deleted file mode 100644 index 15cdff231..000000000 --- a/engine/src/core-data/Common/MatDefs/Misc/SolidColor.j3md +++ /dev/null @@ -1,44 +0,0 @@ -Exception SolidColor.j3md has been marked as obsolete. Please use Unshaded.j3md instead. - -MaterialDef Solid Color { - - MaterialParameters { - Vector4 Color - - // Texture of the glowing parts of the material - Texture2D GlowMap - // The glow color of the object - Color GlowColor - } - - Technique { - VertexShader GLSL100: Common/MatDefs/Misc/Unshaded.vert - FragmentShader GLSL100: Common/MatDefs/Misc/Unshaded.frag - - Defines { - HAS_COLOR : Color - } - - WorldParameters { - WorldViewProjectionMatrix - } - } - - Technique FixedFunc { - } - - Technique Glow { - - VertexShader GLSL100: Common/MatDefs/Misc/Unshaded.vert - FragmentShader GLSL100: Common/MatDefs/Light/Glow.frag - - WorldParameters { - WorldViewProjectionMatrix - } - - Defines { - HAS_GLOWMAP : GlowMap - HAS_GLOWCOLOR : GlowColor - } - } -} \ No newline at end of file diff --git a/engine/src/core-data/Common/MatDefs/Misc/VertexColor.j3md b/engine/src/core-data/Common/MatDefs/Misc/VertexColor.j3md deleted file mode 100644 index d5b3eba8d..000000000 --- a/engine/src/core-data/Common/MatDefs/Misc/VertexColor.j3md +++ /dev/null @@ -1,18 +0,0 @@ -Exception VertexColor.j3md has been marked as obsolete. Please use Unshaded.j3md instead. - -MaterialDef Vertex Color { - - Technique { - VertexShader GLSL100: Common/MatDefs/Misc/Unshaded.vert - FragmentShader GLSL100: Common/MatDefs/Misc/Unshaded.frag - - Defines { - HAS_VERTEXCOLOR - } - - WorldParameters { - WorldViewProjectionMatrix - } - } - -} \ No newline at end of file diff --git a/engine/src/core-data/Common/MatDefs/Misc/WireColor.j3md b/engine/src/core-data/Common/MatDefs/Misc/WireColor.j3md deleted file mode 100644 index 51a473348..000000000 --- a/engine/src/core-data/Common/MatDefs/Misc/WireColor.j3md +++ /dev/null @@ -1,38 +0,0 @@ -Exception WireColor.j3md has been marked as obsolete. Please use Unshaded.j3md instead. - -MaterialDef Wire Color { - - MaterialParameters { - Vector4 Color : Color - } - - Technique { - VertexShader GLSL100: Common/MatDefs/Misc/Unshaded.vert - FragmentShader GLSL100: Common/MatDefs/Misc/Unshaded.frag - - RenderState { - FaceCull Off - Blend Alpha - AlphaTestFalloff 0.01 - Wireframe On - } - - Defines { - HAS_COLOR : Color - } - - WorldParameters { - WorldViewProjectionMatrix - } - } - - Technique FixedFunc { - RenderState { - FaceCull Off - Blend Alpha - AlphaTestFalloff 0.01 - Wireframe On - } - } - -} \ No newline at end of file