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

Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning

This commit is contained in:
samuele3hu 2014-10-19 17:00:05 +08:00
parent 8318b16922
commit 634d42775e
4 changed files with 30 additions and 3135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -1098,7 +1098,7 @@ bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue , const char*
ok = false;
break;
}
for (int i = 0; i < len; i++)
for (size_t i = 0; i < len; i++)
{
lua_pushnumber(L,i + 1);
lua_gettable(L,lo);
@ -1143,7 +1143,7 @@ bool luaval_to_array(lua_State* L,int lo, __Array** outValue, const char* funcNa
if (NULL == arr)
return false;
for (int i = 0; i < len; i++)
for (size_t i = 0; i < len; i++)
{
lua_pushnumber(L,i + 1);
lua_gettable(L,lo);
@ -1347,7 +1347,7 @@ bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *nu
cocos2d::Vec2* array = (cocos2d::Vec2*) new Vec2[len];
if (NULL == array)
return false;
for (uint32_t i = 0; i < len; ++i)
for (size_t i = 0; i < len; ++i)
{
lua_pushnumber(L,i + 1);
lua_gettable(L,lo);
@ -1731,7 +1731,7 @@ bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret, co
if (ok)
{
size_t len = lua_objlen(L, lo);
for (int i = 0; i < len; i++)
for (size_t i = 0; i < len; i++)
{
lua_pushnumber(L,i + 1);
lua_gettable(L,lo);
@ -1814,7 +1814,7 @@ bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector<std::string>*
{
size_t len = lua_objlen(L, lo);
std::string value = "";
for (int i = 0; i < len; i++)
for (size_t i = 0; i < len; i++)
{
lua_pushnumber(L, i + 1);
lua_gettable(L,lo);
@ -1854,7 +1854,7 @@ bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector<int>* ret, const
if (ok)
{
size_t len = lua_objlen(L, lo);
for (int i = 0; i < len; i++)
for (size_t i = 0; i < len; i++)
{
lua_pushnumber(L, i + 1);
lua_gettable(L,lo);
@ -1937,7 +1937,7 @@ bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector<float>* ret, c
if (ok)
{
size_t len = lua_objlen(L, lo);
for (int i = 0; i < len; i++)
for (size_t i = 0; i < len; i++)
{
lua_pushnumber(L, i + 1);
lua_gettable(L,lo);
@ -1977,7 +1977,7 @@ bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector<unsigned shor
if (ok)
{
size_t len = lua_objlen(L, lo);
for (int i = 0; i < len; i++)
for (size_t i = 0; i < len; i++)
{
lua_pushnumber(L, i + 1);
lua_gettable(L,lo);

2
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
View File

@ -137,7 +137,7 @@ bool luaval_to_ccvector(lua_State* L, int lo , cocos2d::Vector<T>* ret, const ch
if (ok)
{
size_t len = lua_objlen(L, lo);
for (int i = 0; i < len; i++)
for (size_t i = 0; i < len; i++)
{
lua_pushnumber(L, i + 1);
lua_gettable(L, lo);

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/windows_UIButton_Editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIButton/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/windows_ui_checkbox_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UICheckBox/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/windows_ui_slider_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UISlider/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/windows_ui_ImageView_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIImageView/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/windows_ui_loadingbar_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILoadingBar/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/windows_ui_labelatlas_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILabelAtlas/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/windows_ui_label_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILabel/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/windows_ui_labelbmfont_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILabelBMFont/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/windows_ui_textfield_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UITextField/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/windows_ui_layout_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UILayout/Layout/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/windows_ui_scrollview_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIScrollView/Vertical/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/windows_ui_pageview_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIPageView/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/windows_ui_listview_editor_1.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIListView/Vertical/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/windows_ui_widget_add_node_editor.csb")
self._layout = ccs.GUIReader:getInstance():widgetFromBinaryFile("cocosui/UIEditorTest/UIWidgetAddNode/windows_ui_widget_add_node_editor.csb")
self._uiLayer:addChild(self._layout)
self:configureGUIScene()
end