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

[lua tests] MaterialSystemTest update u_Time uniform (#20083)

This commit is contained in:
Arnold 2019-09-05 15:56:39 +08:00 committed by minggo
parent dcf7baf8c0
commit eed319938d
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp
View File

@ -3348,7 +3348,7 @@ bool luaval_to_uniformLocation(lua_State* L, int pos, cocos2d::backend::UniformL
return false; return false;
lua_pushstring(L, "location"); lua_pushstring(L, "location");
lua_gettable(L, pos); lua_gettable(L, pos - 1);
if (lua_isnil(L, -1)) { if (lua_isnil(L, -1)) {
CCASSERT(false, "invalidate UniformLocation value"); CCASSERT(false, "invalidate UniformLocation value");
} }
@ -3362,7 +3362,7 @@ bool luaval_to_uniformLocation(lua_State* L, int pos, cocos2d::backend::UniformL
lua_pop(L, 1); lua_pop(L, 1);
lua_pushstring(L, "shaderStage"); lua_pushstring(L, "shaderStage");
lua_gettable(L, pos); lua_gettable(L, pos -1);
if (lua_isnil(L, -1)) { if (lua_isnil(L, -1)) {
CCASSERT(false, "invalidate UniformLocation value"); CCASSERT(false, "invalidate UniformLocation value");
} }

14
tests/lua-tests/src/MaterialSystemTest/MaterialSystemTest.lua
View File

@ -133,6 +133,7 @@ function Material_2DEffects:subtitle()
return "Testing effects on Sprite" return "Testing effects on Sprite"
end end
function Material_2DEffects:onEnter() function Material_2DEffects:onEnter()
local properties = cc.Properties:createNonRefCounted("Materials/2d_effects.material#sample") local properties = cc.Properties:createNonRefCounted("Materials/2d_effects.material#sample")
@ -161,6 +162,19 @@ function Material_2DEffects:onEnter()
spriteEdgeDetect:setNormalizedPosition(cc.p(0.8, 0.5)) spriteEdgeDetect:setNormalizedPosition(cc.p(0.8, 0.5))
self:addChild(spriteEdgeDetect) self:addChild(spriteEdgeDetect)
spriteEdgeDetect:setProgramState(mat1:getTechniqueByName("edge_detect"):getPassByIndex(0):getProgramState()) spriteEdgeDetect:setProgramState(mat1:getTechniqueByName("edge_detect"):getPassByIndex(0):getProgramState())
local scheduler = cc.Director:getInstance():getScheduler()
local uTimeLoc = spriteNoise:getProgramState():getUniformLocation("u_Time")
self._schedulerEntry = scheduler:scheduleScriptFunc(function(dt)
local time = cc.Director:getInstance():getTotalFrames() * cc.Director:getInstance():getAnimationInterval()
local random = cc.vec4(time / 10., time, time * 2, time * 4)
spriteNoise:getProgramState():setUniform(uTimeLoc, cc.bytearray.from_vec4(random));
end, 0, false)
end
function Material_2DEffects:onExit()
local scheduler = cc.Director:getInstance():getScheduler()
scheduler:unscheduleScriptEntry(self._schedulerEntry)
end end
---------------------------------------- ----------------------------------------