Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,210 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

5 Commits

Author SHA1 Message Date
Wilson E. Alvarez d5dacd4f0e Use C++11 multiline string literal instead (#16765) 
* Undo pull request #16742 while keeping fixed indentation on ccShader_UI_Gray.frag

* Removed unnecessary whitespace

* Switched implementation to C++11 string literal

Thanks to stevetranby for the suggestion
 2016-11-02 14:13:34 +08:00
James Chen 58acca108b Removes unused 'return' letter in builtin shaders. (#16742) 
* Removes unused 'return' letter in builtin shader.

* Updates indention of ccShader_UI_Gray.frag.
 2016-10-26 16:03:08 +08:00
Ricardo Quesada 9d1ab1ba07 uniform sampler CC_Texture0 MUST NOT be defined on shaders 
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
 2014-05-15 16:47:54 -07:00
Ricardo Quesada 8f71e65482 Compiles on windows, sort of 2014-05-09 19:07:22 -07:00
Ricardo Quesada fec1b82c0a Shader files use STRINGIFY 2014-05-09 16:45:42 -07:00