Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7779 from dabingnn/v3_fixSkinnedOutline 

V3 fix skinned outline
This commit is contained in:
minggo 2014-08-14 11:26:35 +08:00
parent 4056333560 a9a403013c
commit ae11f24cc8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
View File

@ -381,7 +381,7 @@ const std::string Effect3DOutline::_vertShaderFile = "Shaders3D/OutLine.vert";
const std::string Effect3DOutline::_fragShaderFile = "Shaders3D/OutLine.frag";
const std::string Effect3DOutline::_keyInGLProgramCache = "Effect3DLibrary_Outline";
const std::string Effect3DOutline::_vertSkinnedShaderFile = "Shaders3D/SkinnedOutLine.vert";
const std::string Effect3DOutline::_vertSkinnedShaderFile = "Shaders3D/SkinnedOutline.vert";
const std::string Effect3DOutline::_fragSkinnedShaderFile = "Shaders3D/OutLine.frag";
const std::string Effect3DOutline::_keySkinnedInGLProgramCache = "Effect3DLibrary_Outline";
GLProgram* Effect3DOutline::getOrCreateProgram(bool isSkinned /* = false */ )

8
tests/cpp-tests/Resources/Shaders3D/SkinnedOutline.vert
View File

@ -13,7 +13,7 @@ uniform vec4 u_matrixPalette[SKINNING_JOINT_COUNT * 3];
// Varyings
varying vec2 TextureCoordOut;
vec4 SkinnedVec3(vec3 vec)
vec4 SkinnedVec3(vec4 vec)
{
float blendWeight = a_blendWeight[0];
@ -54,7 +54,7 @@ vec4 SkinnedVec3(vec3 vec)
vec4 _skinnedPosition;
vec4 postion = vec4(vec, 1.0);
vec4 postion = vec;
_skinnedPosition.x = dot(postion, matrixPalette1);
_skinnedPosition.y = dot(postion, matrixPalette2);
_skinnedPosition.z = dot(postion, matrixPalette3);
@ -65,9 +65,9 @@ vec4 SkinnedVec3(vec3 vec)
void main()
{
vec4 pos = CC_MVPMatrix * SkinnedVec3(a_position);
vec4 pos = CC_MVPMatrix * SkinnedVec3(vec4(a_position,1.0));
vec4 normalproj = CC_MVPMatrix * vec4(SkinnedVec3(a_normal).xyz, 0);
vec4 normalproj = CC_MVPMatrix * vec4(SkinnedVec3(vec4(a_normal,0.0)).xyz, 0);
normalproj = normalize(normalproj);
pos.xy += normalproj.xy * (OutlineWidth * (pos.z * 0.5 + 0.5));