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

Update Mac project setting and some lua test cases about UI and ActionTimeline

This commit is contained in:
samuele3hu 2014-10-17 17:35:50 +08:00
parent 936510411b
commit 1d6128443a
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/cocos2d_tests.xcodeproj/project.pbxproj
View File

@ -50,6 +50,7 @@
15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; };
15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
15B0870D195AD52000D6F62B /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
15B13E5219F0FD4D008A1ADC /* Manifests in Resources */ = {isa = PBXBuildFile; fileRef = 15B3709219EE5D1000ABE682 /* Manifests */; };
15B3709319EE5D1000ABE682 /* Manifests in Resources */ = {isa = PBXBuildFile; fileRef = 15B3709219EE5D1000ABE682 /* Manifests */; };
15B3709419EE5D1000ABE682 /* Manifests in Resources */ = {isa = PBXBuildFile; fileRef = 15B3709219EE5D1000ABE682 /* Manifests */; };
15B3709819EE5DBA00ABE682 /* AssetsManagerExTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15B3709619EE5DBA00ABE682 /* AssetsManagerExTest.cpp */; };
@ -7367,6 +7368,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
15B13E5219F0FD4D008A1ADC /* Manifests in Resources */,
156EAE071977D0BD00F53709 /* ActionTimeline in Resources */,
15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */,
3E2F27BC19D00D7200E7C490 /* audio in Resources */,

8
tests/lua-tests/src/CocoStudioTest/CocoStudioActionTimelineTest/CocoStudioActionTimelineTest.lua
View File

@ -186,7 +186,7 @@ function TestActionTimeline.extend(target)
end
function TestActionTimeline:onEnter()
cc.SpriteFrameCache:getInstance():addSpriteFramesWithFile("armature/Cowboy0.plist", "armature/Cowboy0.png")
cc.SpriteFrameCache:getInstance():addSpriteFrames("armature/Cowboy0.plist", "armature/Cowboy0.png")
local node = cc.CSLoader:createNode("ActionTimeline/boy_1.csb")
local action = cc.CSLoader:createTimeline("ActionTimeline/boy_1.csb")
@ -239,7 +239,7 @@ function TestChangePlaySection.extend(target)
end
function TestChangePlaySection:onEnter()
cc.SpriteFrameCache:getInstance():addSpriteFramesWithFile("armature/Cowboy0.plist", "armature/Cowboy0.png")
cc.SpriteFrameCache:getInstance():addSpriteFrames("armature/Cowboy0.plist", "armature/Cowboy0.png")
local node = cc.CSLoader:createNode("ActionTimeline/boy_1.csb")
local action = cc.CSLoader:createTimeline("ActionTimeline/boy_1.csb")
@ -306,7 +306,7 @@ function TestTimelineFrameEvent.extend(target)
end
function TestTimelineFrameEvent:onEnter()
cc.SpriteFrameCache:getInstance():addSpriteFramesWithFile("armature/Cowboy0.plist", "armature/Cowboy0.png")
cc.SpriteFrameCache:getInstance():addSpriteFrames("armature/Cowboy0.plist", "armature/Cowboy0.png")
local node = cc.CSLoader:createNode("ActionTimeline/boy_1.csb")
local action = cc.CSLoader:createTimeline("ActionTimeline/boy_1.csb")
@ -374,7 +374,7 @@ function TestTimelinePerformance.extend(target)
end
function TestTimelinePerformance:onEnter()
cc.SpriteFrameCache:getInstance():addSpriteFramesWithFile("armature/Cowboy0.plist", "armature/Cowboy0.png")
cc.SpriteFrameCache:getInstance():addSpriteFrames("armature/Cowboy0.plist", "armature/Cowboy0.png")
for i = 1,100 do
local node = cc.CSLoader:createNode("ActionTimeline/boy_1.csb")

28
tests/lua-tests/src/CocoStudioTest/CocoStudioUIEditorTest/CocoStudioUIEditorTest.lua
View File

@ -93,7 +93,7 @@ end
function UIButtonTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIButton_Editor/windows_UIButton_Editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
@ -161,7 +161,7 @@ end
function UICheckBoxEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UICheckBox_Editor/windows_ui_checkbox_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
@ -233,7 +233,7 @@ end
function UISliderEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UISlider_Editor/windows_ui_slider_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
@ -289,7 +289,7 @@ end
function UIImageViewEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIImageView_Editor/windows_ui_ImageView_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
end
@ -343,7 +343,7 @@ end
function LoadingBarEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILoadingBar_Editor/windows_ui_loadingbar_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
@ -410,7 +410,7 @@ end
function LabelAtalsEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILabelAtlas_Editor/windows_ui_labelatlas_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
end
@ -458,7 +458,7 @@ end
function LabelEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILabel_Editor/ui_label_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILabel_Editor/windows_ui_label_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
end
@ -506,7 +506,7 @@ end
function LabelBMFontEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILabelBMFont_Editor/windows_ui_labelbmfont_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
end
@ -575,7 +575,7 @@ end
function TextFieldEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UITextField_Editor/windows_ui_textfield_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
@ -632,7 +632,7 @@ end
function LayoutEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/windows_ui_layout_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
end
@ -680,7 +680,7 @@ end
function ScrollViewEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/windows_ui_scrollview_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
end
@ -728,7 +728,7 @@ end
function PageViewEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIPageView_Editor/windows_ui_pageview_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
end
@ -781,7 +781,7 @@ end
function ListViewEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/windows_ui_listview_editor_1.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
end
@ -838,7 +838,7 @@ end
function WidgetAddNodeEditorTest:initExtend()
self:init()
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIWidgetAddNode_Editor/windows_ui_widget_add_node_editor.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
end