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

Update cocos2d basic lua files and LabelTestNew.lua

This commit is contained in:
samuele3hu 2014-10-21 15:56:38 +08:00
parent 65f007f5ff
commit 2f9dbb7142
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua
View File

@ -8,11 +8,11 @@ local dp_pointSize = 1.0
local SHADER_NAME_POSITION_U_COLOR = "ShaderPosition_uColor" local SHADER_NAME_POSITION_U_COLOR = "ShaderPosition_uColor"
local targetPlatform = CCApplication:getInstance():getTargetPlatform() local targetPlatform = cc.Application:getInstance():getTargetPlatform()
local function lazy_init() local function lazy_init()
if not dp_initialized then if not dp_initialized then
dp_shader = CCShaderCache:getInstance():getProgram(SHADER_NAME_POSITION_U_COLOR) dp_shader = cc.ShaderCache:getInstance():getProgram(SHADER_NAME_POSITION_U_COLOR)
--dp_shader:retain() --dp_shader:retain()
if nil ~= dp_shader then if nil ~= dp_shader then
dp_colorLocation = gl.getUniformLocation( dp_shader:getProgram(), "u_color") dp_colorLocation = gl.getUniformLocation( dp_shader:getProgram(), "u_color")
@ -52,7 +52,7 @@ function ccDrawColor4f(r,g,b,a)
end end
function ccPointSize(pointSize) function ccPointSize(pointSize)
dp_pointSize = pointSize * CCDirector:getInstance():getContentScaleFactor() dp_pointSize = pointSize * cc.Director:getInstance():getContentScaleFactor()
end end
function ccDrawColor4B(r,g,b,a) function ccDrawColor4B(r,g,b,a)

5
cocos/scripting/lua-bindings/script/init.lua
View File

@ -3,6 +3,7 @@ require "cocos.cocos2d.Cocos2d"
require "cocos.cocos2d.Cocos2dConstants" require "cocos.cocos2d.Cocos2dConstants"
require "cocos.cocos2d.extern" require "cocos.cocos2d.extern"
require "cocos.cocos2d.bitExtend" require "cocos.cocos2d.bitExtend"
require "cocos.cocos2d.DrawPrimitives"
-- opengl -- opengl
require "cocos.cocos2d.Opengl" require "cocos.cocos2d.Opengl"
@ -27,11 +28,15 @@ require "cocos.extension.ExtensionConstants"
-- network -- network
require "cocos.network.NetworkConstants" require "cocos.network.NetworkConstants"
-- Spine
require "cocos.spine.SpineConstants"
if CC_USE_DEPRECATED_API then if CC_USE_DEPRECATED_API then
-- CCLuaEngine -- CCLuaEngine
require "cocos.cocos2d.DeprecatedCocos2dClass" require "cocos.cocos2d.DeprecatedCocos2dClass"
require "cocos.cocos2d.DeprecatedCocos2dEnum" require "cocos.cocos2d.DeprecatedCocos2dEnum"
require "cocos.cocos2d.DeprecatedCocos2dFunc" require "cocos.cocos2d.DeprecatedCocos2dFunc"
require "cocos.cocos2d.DeprecatedOpenglEnum"
-- register_cocostudio_module -- register_cocostudio_module
require "cocos.cocostudio.DeprecatedCocoStudioClass" require "cocos.cocostudio.DeprecatedCocoStudioClass"

4
tests/lua-tests/src/LabelTestNew/LabelTestNew.lua
View File

@ -1278,8 +1278,8 @@ local LabelCrashTest = {}
function LabelCrashTest.create() function LabelCrashTest.create()
local layer = cc.Layer:create() local layer = cc.Layer:create()
Helper.initWithLayer(layer) Helper.initWithLayer(layer)
Helper.titleLabel:setString("New Label + .TTF") Helper.titleLabel:setString("New Label Crash Test")
Helper.subtitleLabel:setString("Testing rendering base on DistanceField") Helper.subtitleLabel:setString("Not crash and show [Test123] when using unknown character.")
local ttfConfig = {} local ttfConfig = {}
ttfConfig.fontFilePath = "fonts/arial.ttf" ttfConfig.fontFilePath = "fonts/arial.ttf"