sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Fix spelling error in Unshaded material Seperate => Separate, hopefully no-one was using it as otherwise it would break a lot of things

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7553 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..rd 2011-06-07 01:48:35 +00:00
parent 02502ef491
commit 39e3e2d11f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/core-data/Common/MatDefs/Misc/Unshaded.frag
View File

@ -1,6 +1,6 @@
uniform vec4 m_Color; 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 #define NEED_TEXCOORD1
#endif #endif
@ -39,7 +39,7 @@ void main(){
#endif #endif
#ifdef HAS_LIGHTMAP #ifdef HAS_LIGHTMAP
#ifdef SEPERATE_TEXCOORD #ifdef SEPARATE_TEXCOORD
color.rgb *= texture2D(m_LightMap, texCoord2).rgb; color.rgb *= texture2D(m_LightMap, texCoord2).rgb;
#else #else
color.rgb *= texture2D(m_LightMap, texCoord1).rgb; color.rgb *= texture2D(m_LightMap, texCoord1).rgb;

4
engine/src/core-data/Common/MatDefs/Misc/Unshaded.j3md
View File

@ -5,7 +5,7 @@ MaterialDef Unshaded {
Texture2D LightMap Texture2D LightMap
Color Color : Color Color Color : Color
Boolean VertexColor Boolean VertexColor
Boolean SeperateTexCoord Boolean SeparateTexCoord
// Texture of the glowing parts of the material // Texture of the glowing parts of the material
Texture2D GlowMap Texture2D GlowMap
@ -22,7 +22,7 @@ MaterialDef Unshaded {
} }
Defines { Defines {
SEPERATE_TEXCOORD : SeperateTexCoord SEPARATE_TEXCOORD : SeparateTexCoord
HAS_COLORMAP : ColorMap HAS_COLORMAP : ColorMap
HAS_LIGHTMAP : LightMap HAS_LIGHTMAP : LightMap
HAS_VERTEXCOLOR : VertexColor HAS_VERTEXCOLOR : VertexColor

6
engine/src/core-data/Common/MatDefs/Misc/Unshaded.vert
View File

@ -1,7 +1,7 @@
uniform mat4 g_WorldViewProjectionMatrix; uniform mat4 g_WorldViewProjectionMatrix;
attribute vec3 inPosition; 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 #define NEED_TEXCOORD1
#endif #endif
@ -10,7 +10,7 @@ attribute vec3 inPosition;
varying vec2 texCoord1; varying vec2 texCoord1;
#endif #endif
#ifdef SEPERATE_TEXCOORD #ifdef SEPARATE_TEXCOORD
attribute vec2 inTexCoord2; attribute vec2 inTexCoord2;
varying vec2 texCoord2; varying vec2 texCoord2;
#endif #endif
@ -25,7 +25,7 @@ void main(){
texCoord1 = inTexCoord; texCoord1 = inTexCoord;
#endif #endif
#ifdef SEPERATE_TEXCOORD #ifdef SEPARATE_TEXCOORD
texCoord2 = inTexCoord2; texCoord2 = inTexCoord2;
#endif #endif