From e8f195cf82c7c30e991d53bfec691b110d98a93a Mon Sep 17 00:00:00 2001 From: zilongshanren Date: Wed, 7 Sep 2016 14:45:57 +0800 Subject: [PATCH] refactoring scale9sprite and fix gray scale shader --- .../cocos2d_libs.xcodeproj/project.pbxproj | 4 + .../editor-support/creator/CCScale9Sprite.cpp | 84 +++++-------------- native/cocos/renderer/CCGLProgram.cpp | 1 + native/cocos/renderer/CCGLProgram.h | 1 + native/cocos/renderer/CCGLProgramCache.cpp | 12 +++ .../renderer/ccShader_SpriteDistortion.frag | 28 +++++++ native/cocos/renderer/ccShaders.cpp | 1 + native/cocos/renderer/ccShaders.h | 2 + 8 files changed, 71 insertions(+), 62 deletions(-) create mode 100644 native/cocos/renderer/ccShader_SpriteDistortion.frag diff --git a/native/build/cocos2d_libs.xcodeproj/project.pbxproj b/native/build/cocos2d_libs.xcodeproj/project.pbxproj index 5f1b6e97e5..80815d1dcb 100644 --- a/native/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/native/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -1848,6 +1848,8 @@ 299CF1FA19A434BC00C378C1 /* ccRandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccRandom.h; path = ../base/ccRandom.h; sourceTree = ""; }; 29CB8F4A1929D1BB00C841D6 /* UILayoutManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutManager.cpp; sourceTree = ""; }; 29CB8F4B1929D1BB00C841D6 /* UILayoutManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutManager.h; sourceTree = ""; }; + 29D57CFC1D7FE03C001735C5 /* ccShader_UI_Gray.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_UI_Gray.frag; sourceTree = ""; }; + 29D57CFF1D7FEC1C001735C5 /* ccShader_SpriteDistortion.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_SpriteDistortion.frag; sourceTree = ""; }; 29E99D1C1957BA7000046604 /* CocoLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocoLoader.cpp; sourceTree = ""; }; 29E99D1D1957BA7000046604 /* CocoLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoLoader.h; sourceTree = ""; }; 38ACD1FA1A27111900C3093D /* WidgetCallBackHandlerProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WidgetCallBackHandlerProtocol.cpp; sourceTree = ""; }; @@ -3582,6 +3584,8 @@ 5034CA5D191D591900CE6051 /* shaders */ = { isa = PBXGroup; children = ( + 29D57CFF1D7FEC1C001735C5 /* ccShader_SpriteDistortion.frag */, + 29D57CFC1D7FE03C001735C5 /* ccShader_UI_Gray.frag */, B241A6E21AFB0BE700C5623C /* ccShader_CameraClear.frag */, B241A6E31AFB0BE700C5623C /* ccShader_CameraClear.vert */, B20564AA1A6E5744001C1B6E /* ccShader_PositionColorTextureAsPointsize.vert */, diff --git a/native/cocos/editor-support/creator/CCScale9Sprite.cpp b/native/cocos/editor-support/creator/CCScale9Sprite.cpp index 41a04f1cab..e3b375f6f5 100755 --- a/native/cocos/editor-support/creator/CCScale9Sprite.cpp +++ b/native/cocos/editor-support/creator/CCScale9Sprite.cpp @@ -32,6 +32,7 @@ #include "renderer/ccShaders.h" namespace creator { + using namespace cocos2d; class simpleQuadGenerator { @@ -894,8 +895,8 @@ _fillStart(0), _fillRange(0), _needRebuildRenderCommand(true) { - this->setAnchorPoint(cocos2d::Vec2::ANCHOR_MIDDLE); - this->setGLProgramState(cocos2d::GLProgramState::getOrCreateWithGLProgramName(cocos2d::GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP)); + this->setAnchorPoint(Vec2::ANCHOR_MIDDLE); + this->setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP)); } Scale9SpriteV2::~Scale9SpriteV2() { @@ -962,57 +963,16 @@ void Scale9SpriteV2::enableTrimmedContentSize(bool isTrimmed) { void Scale9SpriteV2::setState(State state) { this->_brightState = state; - auto programCache = cocos2d::GLProgramCache::getInstance(); - if(!programCache) return; - if(Scale9SpriteV2::State::DISTORTION == state) { - cocos2d::GLProgram* distortionProgram(nullptr); - distortionProgram = programCache->getGLProgram(distortionProgramKey); - if(!distortionProgram) { - //TODO: add implementation; - std::string fShader = ""; - fShader = fShader - + "varying vec4 v_fragmentColor; \n" - + "varying vec2 v_texCoord; \n" - + "uniform vec2 u_offset; \n" - + "uniform vec2 u_offset_tiling; \n" - + "const float PI = 3.14159265359;\n" - + "void main() \n" - + "{ \n" - + "float halfPI = 0.5 * PI;\n" - + "float maxFactor = sin(halfPI);\n" - + "vec2 uv = v_texCoord;\n" - + "vec2 xy = 2.0 * uv.xy - 1.0;\n" - + "float d = length(xy);\n" - + "if (d < (2.0-maxFactor)) {\n" - + "d = length(xy * maxFactor);\n" - + "float z = sqrt(1.0 - d * d);\n" - + " float r = atan(d, z) / PI;\n" - + "float phi = atan(xy.y, xy.x);\n" - + "uv.x = r * cos(phi) + 0.5;\n" - + "uv.y = r * sin(phi) + 0.5;\n" - + "} else {\n" - + "discard;\n" - + "}\n" - + "uv = uv * u_offset_tiling + u_offset;\n" - + "uv = fract(uv); \n" - + "gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, uv);\n" - + "}"; - - distortionProgram = cocos2d::GLProgram::createWithByteArrays(cocos2d::ccPositionTextureColor_noMVP_vert, fShader.c_str()); - - distortionProgram->link(); - programCache->addGLProgram(distortionProgram, distortionProgramKey); - } - - if(distortionProgram) { - auto glProgramState = cocos2d::GLProgramState::create(distortionProgram); - glProgramState->setUniformVec2("u_offset", this->_distortionOffset); - glProgramState->setUniformVec2("u_offset_tiling", this->_distortionTiling); - this->setGLProgramState(glProgramState); - } + + if(State::DISTORTION == state) { + auto glProgramState = GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_SPRITE_DISTORTION); + glProgramState->setUniformVec2("u_offset", this->_distortionOffset); + glProgramState->setUniformVec2("u_offset_tiling", this->_distortionTiling); + this->setGLProgramState(glProgramState); + } else if (State::GRAY == state) { + this->setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_GRAYSCALE)); } else { - auto program = programCache->getGLProgram(cocos2d::GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP); - this->setGLProgram(program); + this->setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP)); } @@ -1179,16 +1139,16 @@ void Scale9SpriteV2::draw(cocos2d::Renderer *renderer, const cocos2d::Mat4 &tran } - if (!_indices.empty() && !_verts.empty()) { - cocos2d::TrianglesCommand::Triangles triangles; - triangles.indices = &this->_indices[0]; - triangles.verts = &this->_verts[0]; - triangles.vertCount = (int)this->_verts.size(); - triangles.indexCount = (int)this->_indices.size(); - auto texture = this->_spriteFrame->getTexture(); - this->_renderCommand.init(_globalZOrder, texture->getName(), _glProgramState, _blendFunc, triangles, transform, 0); - renderer->addCommand(&this->_renderCommand); - } + if (!_indices.empty() && !_verts.empty()) { + cocos2d::TrianglesCommand::Triangles triangles; + triangles.indices = &this->_indices[0]; + triangles.verts = &this->_verts[0]; + triangles.vertCount = (int)this->_verts.size(); + triangles.indexCount = (int)this->_indices.size(); + auto texture = this->_spriteFrame->getTexture(); + this->_renderCommand.init(_globalZOrder, texture->getName(), _glProgramState, _blendFunc, triangles, transform, 0); + renderer->addCommand(&this->_renderCommand); + } } diff --git a/native/cocos/renderer/CCGLProgram.cpp b/native/cocos/renderer/CCGLProgram.cpp index c82160e7d5..5e2464afd7 100644 --- a/native/cocos/renderer/CCGLProgram.cpp +++ b/native/cocos/renderer/CCGLProgram.cpp @@ -88,6 +88,7 @@ const char* GLProgram::SHADER_NAME_POSITION_TEXTURE_A8_COLOR = "ShaderPositionTe const char* GLProgram::SHADER_NAME_POSITION_U_COLOR = "ShaderPosition_uColor"; const char* GLProgram::SHADER_NAME_POSITION_LENGTH_TEXTURE_COLOR = "ShaderPositionLengthTextureColor"; const char* GLProgram::SHADER_NAME_POSITION_GRAYSCALE = "ShaderUIGrayScale"; +const char* GLProgram::SHADER_NAME_SPRITE_DISTORTION = "ShaderSpriteDistortion"; const char* GLProgram::SHADER_NAME_LABEL_DISTANCEFIELD_NORMAL = "ShaderLabelDFNormal"; const char* GLProgram::SHADER_NAME_LABEL_DISTANCEFIELD_GLOW = "ShaderLabelDFGlow"; const char* GLProgram::SHADER_NAME_LABEL_NORMAL = "ShaderLabelNormal"; diff --git a/native/cocos/renderer/CCGLProgram.h b/native/cocos/renderer/CCGLProgram.h index 56dd25055c..aa8d791e58 100644 --- a/native/cocos/renderer/CCGLProgram.h +++ b/native/cocos/renderer/CCGLProgram.h @@ -192,6 +192,7 @@ public: /**Built in shader for ui effects */ static const char* SHADER_NAME_POSITION_GRAYSCALE; + static const char* SHADER_NAME_SPRITE_DISTORTION; /** @{ Built in shader for label and label with effects. */ diff --git a/native/cocos/renderer/CCGLProgramCache.cpp b/native/cocos/renderer/CCGLProgramCache.cpp index 3d9ee6ddbf..261f79ae30 100644 --- a/native/cocos/renderer/CCGLProgramCache.cpp +++ b/native/cocos/renderer/CCGLProgramCache.cpp @@ -53,6 +53,7 @@ enum { kShaderType_LabelDistanceFieldNormal, kShaderType_LabelDistanceFieldGlow, kShaderType_UIGrayScale, + kShaderType_SpriteDistortion, kShaderType_LabelNormal, kShaderType_LabelOutline, kShaderType_CameraClear, @@ -193,6 +194,10 @@ void GLProgramCache::loadDefaultGLPrograms() loadDefaultGLProgram(p, kShaderType_UIGrayScale); _programs.insert(std::make_pair(GLProgram::SHADER_NAME_POSITION_GRAYSCALE, p)); + p = new (std::nothrow) GLProgram(); + loadDefaultGLProgram(p, kShaderType_SpriteDistortion); + _programs.insert(std::make_pair(GLProgram::SHADER_NAME_SPRITE_DISTORTION, p)); + p = new (std::nothrow) GLProgram(); loadDefaultGLProgram(p, kShaderType_LabelNormal); _programs.insert( std::make_pair(GLProgram::SHADER_NAME_LABEL_NORMAL, p) ); @@ -305,6 +310,10 @@ void GLProgramCache::reloadDefaultGLPrograms() p = getGLProgram(GLProgram::SHADER_NAME_POSITION_GRAYSCALE); p->reset(); loadDefaultGLProgram(p, kShaderType_UIGrayScale); + + p = getGLProgram(GLProgram::SHADER_NAME_SPRITE_DISTORTION); + p->reset(); + loadDefaultGLProgram(p, kShaderType_SpriteDistortion); } void GLProgramCache::reloadDefaultGLProgramsRelativeToLights() @@ -361,6 +370,9 @@ void GLProgramCache::loadDefaultGLProgram(GLProgram *p, int type) p->initWithByteArrays(ccPositionTextureColor_noMVP_vert, ccPositionTexture_GrayScale_frag); break; + case kShaderType_SpriteDistortion: + p->initWithByteArrays(ccPositionTextureColor_noMVP_vert, ccSprite_Distortion_frag); + break; case kShaderType_LabelNormal: p->initWithByteArrays(ccLabel_vert, ccLabelNormal_frag); break; diff --git a/native/cocos/renderer/ccShader_SpriteDistortion.frag b/native/cocos/renderer/ccShader_SpriteDistortion.frag new file mode 100644 index 0000000000..28799318d6 --- /dev/null +++ b/native/cocos/renderer/ccShader_SpriteDistortion.frag @@ -0,0 +1,28 @@ +const char* ccSprite_Distortion_frag = STRINGIFY( +varying vec4 v_fragmentColor; \n +varying vec2 v_texCoord; \n +uniform vec2 u_offset; \n +uniform vec2 u_offset_tiling; \n +const float PI = 3.14159265359;\n +void main() \n +{ \n +float halfPI = 0.5 * PI;\n +float maxFactor = sin(halfPI);\n +vec2 uv = v_texCoord;\n +vec2 xy = 2.0 * uv.xy - 1.0;\n +float d = length(xy);\n +if (d < (2.0-maxFactor)) {\n +d = length(xy * maxFactor);\n +float z = sqrt(1.0 - d * d);\n +float r = atan(d, z) / PI;\n +float phi = atan(xy.y, xy.x);\n +uv.x = r * cos(phi) + 0.5;\n +uv.y = r * sin(phi) + 0.5;\n +} else {\n +discard;\n +}\n +uv = uv * u_offset_tiling + u_offset;\n +uv = fract(uv); \n +gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, uv);\n +} +); diff --git a/native/cocos/renderer/ccShaders.cpp b/native/cocos/renderer/ccShaders.cpp index a1ea7eb518..aed05f08a9 100644 --- a/native/cocos/renderer/ccShaders.cpp +++ b/native/cocos/renderer/ccShaders.cpp @@ -69,6 +69,7 @@ NS_CC_BEGIN #include "renderer/ccShader_PositionColorLengthTexture.vert" #include "renderer/ccShader_UI_Gray.frag" +#include "renderer/ccShader_SpriteDistortion.frag" // #include "renderer/ccShader_Label.vert" #include "renderer/ccShader_Label_df.frag" diff --git a/native/cocos/renderer/ccShaders.h b/native/cocos/renderer/ccShaders.h index 21c1b89ba9..96f72b23ce 100644 --- a/native/cocos/renderer/ccShaders.h +++ b/native/cocos/renderer/ccShaders.h @@ -75,6 +75,8 @@ extern CC_DLL const GLchar * ccLabelOutline_frag; extern CC_DLL const GLchar * ccLabel_vert; +extern CC_DLL const GLchar * ccSprite_Distortion_frag; + extern CC_DLL const GLchar * cc3D_PositionTex_vert; extern CC_DLL const GLchar * cc3D_SkinPositionTex_vert; extern CC_DLL const GLchar * cc3D_ColorTex_frag;