From 39e3e2d11f26bed95075c100a9f14a7f5e84b3ae Mon Sep 17 00:00:00 2001 From: "sha..rd" Date: Tue, 7 Jun 2011 01:48:35 +0000 Subject: [PATCH] * Fix spelling error in Unshaded material Seperate => Separate, hopefully no-one was using it as otherwise it would break a lot of things git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7553 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/core-data/Common/MatDefs/Misc/Unshaded.frag | 4 ++-- engine/src/core-data/Common/MatDefs/Misc/Unshaded.j3md | 4 ++-- engine/src/core-data/Common/MatDefs/Misc/Unshaded.vert | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/src/core-data/Common/MatDefs/Misc/Unshaded.frag b/engine/src/core-data/Common/MatDefs/Misc/Unshaded.frag index bcfa31b69..a5f1904da 100644 --- a/engine/src/core-data/Common/MatDefs/Misc/Unshaded.frag +++ b/engine/src/core-data/Common/MatDefs/Misc/Unshaded.frag @@ -1,6 +1,6 @@ uniform vec4 m_Color; -#if defined(HAS_GLOWMAP) || defined(HAS_COLORMAP) || (defined(HAS_LIGHTMAP) && !defined(SEPERATE_TEXCOORD)) +#if defined(HAS_GLOWMAP) || defined(HAS_COLORMAP) || (defined(HAS_LIGHTMAP) && !defined(SEPARATE_TEXCOORD)) #define NEED_TEXCOORD1 #endif @@ -39,7 +39,7 @@ void main(){ #endif #ifdef HAS_LIGHTMAP - #ifdef SEPERATE_TEXCOORD + #ifdef SEPARATE_TEXCOORD color.rgb *= texture2D(m_LightMap, texCoord2).rgb; #else color.rgb *= texture2D(m_LightMap, texCoord1).rgb; diff --git a/engine/src/core-data/Common/MatDefs/Misc/Unshaded.j3md b/engine/src/core-data/Common/MatDefs/Misc/Unshaded.j3md index 4a49426c5..c50e86116 100644 --- a/engine/src/core-data/Common/MatDefs/Misc/Unshaded.j3md +++ b/engine/src/core-data/Common/MatDefs/Misc/Unshaded.j3md @@ -5,7 +5,7 @@ MaterialDef Unshaded { Texture2D LightMap Color Color : Color Boolean VertexColor - Boolean SeperateTexCoord + Boolean SeparateTexCoord // Texture of the glowing parts of the material Texture2D GlowMap @@ -22,7 +22,7 @@ MaterialDef Unshaded { } Defines { - SEPERATE_TEXCOORD : SeperateTexCoord + SEPARATE_TEXCOORD : SeparateTexCoord HAS_COLORMAP : ColorMap HAS_LIGHTMAP : LightMap HAS_VERTEXCOLOR : VertexColor diff --git a/engine/src/core-data/Common/MatDefs/Misc/Unshaded.vert b/engine/src/core-data/Common/MatDefs/Misc/Unshaded.vert index 39dd97300..7bf9f7e64 100644 --- a/engine/src/core-data/Common/MatDefs/Misc/Unshaded.vert +++ b/engine/src/core-data/Common/MatDefs/Misc/Unshaded.vert @@ -1,7 +1,7 @@ uniform mat4 g_WorldViewProjectionMatrix; attribute vec3 inPosition; -#if defined(HAS_COLORMAP) || (defined(HAS_LIGHTMAP) && !defined(SEPERATE_TEXCOORD)) +#if defined(HAS_COLORMAP) || (defined(HAS_LIGHTMAP) && !defined(SEPARATE_TEXCOORD)) #define NEED_TEXCOORD1 #endif @@ -10,7 +10,7 @@ attribute vec3 inPosition; varying vec2 texCoord1; #endif -#ifdef SEPERATE_TEXCOORD +#ifdef SEPARATE_TEXCOORD attribute vec2 inTexCoord2; varying vec2 texCoord2; #endif @@ -25,7 +25,7 @@ void main(){ texCoord1 = inTexCoord; #endif - #ifdef SEPERATE_TEXCOORD + #ifdef SEPARATE_TEXCOORD texCoord2 = inTexCoord2; #endif