diff --git a/spine-cocos2dx/example/Classes/ExampleScene.cpp b/spine-cocos2dx/example/Classes/ExampleScene.cpp index 9481e6a67..dbf5300ce 100644 --- a/spine-cocos2dx/example/Classes/ExampleScene.cpp +++ b/spine-cocos2dx/example/Classes/ExampleScene.cpp @@ -20,8 +20,8 @@ bool ExampleScene::init() { Atlas *atlas = new Atlas("spineboy.txt"); SkeletonJson json(atlas); json.scale = 0.5; - SkeletonData *skeletonData = json.readSkeletonData("../data/spineboy-skeleton.json"); - Animation *animation = json.readAnimation("../data/spineboy-walk.json", skeletonData); + SkeletonData *skeletonData = json.readSkeletonData("spineboy-skeleton.json"); + Animation *animation = json.readAnimation("spineboy-walk.json", skeletonData); CCSkeleton* skeletonNode = new CCSkeleton(skeletonData); skeletonNode->state->setAnimation(animation, true); diff --git a/spine-cocos2dx/example/proj.win32/main.cpp b/spine-cocos2dx/example/proj.win32/main.cpp index 370c4d7e7..777d50f7a 100644 --- a/spine-cocos2dx/example/proj.win32/main.cpp +++ b/spine-cocos2dx/example/proj.win32/main.cpp @@ -17,7 +17,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, CCEGLView* eglView = CCEGLView::sharedOpenGLView(); eglView->setViewName("ExampleSpine"); eglView->setFrameSize(480, 320); - // So we need to invoke 'setFrameZoomFactor'(only valid on desktop(win32, mac, linux)) to make the window smaller. + // So we need to invoke 'setFrameZoomFactor' (only valid on desktop(win32, mac, linux)) to make the window smaller. // eglView->setFrameZoomFactor(0.4f); return CCApplication::sharedApplication()->run(); } diff --git a/spine-cocos2dx/example/proj.win32/spine-cocos2dx.sln b/spine-cocos2dx/example/proj.win32/spine-cocos2dx.sln index 65c30b1a1..415536875 100644 --- a/spine-cocos2dx/example/proj.win32/spine-cocos2dx.sln +++ b/spine-cocos2dx/example/proj.win32/spine-cocos2dx.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2012 for Windows Desktop Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2dx\proj.win32\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spine-cocos2dx", "spine-cocos2dx.vcxproj", "{DB4C84B9-AC6D-46A1-B7E6-A77FE4515ACF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -13,10 +15,10 @@ Global {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.ActiveCfg = Debug|Win32 - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32 - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32 - {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.Build.0 = Release|Win32 + {DB4C84B9-AC6D-46A1-B7E6-A77FE4515ACF}.Debug|Win32.ActiveCfg = Debug|Win32 + {DB4C84B9-AC6D-46A1-B7E6-A77FE4515ACF}.Debug|Win32.Build.0 = Debug|Win32 + {DB4C84B9-AC6D-46A1-B7E6-A77FE4515ACF}.Release|Win32.ActiveCfg = Release|Win32 + {DB4C84B9-AC6D-46A1-B7E6-A77FE4515ACF}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/spine-cocos2dx/example/proj.win32/spine-cocos2dx.vcxproj b/spine-cocos2dx/example/proj.win32/spine-cocos2dx.vcxproj index aeacee87a..6f92e35f1 100644 --- a/spine-cocos2dx/example/proj.win32/spine-cocos2dx.vcxproj +++ b/spine-cocos2dx/example/proj.win32/spine-cocos2dx.vcxproj @@ -66,7 +66,7 @@ Disabled - $(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\Classes;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\spine-cpp\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\cocos2dx;$(ProjectDir)..\..\cocos2dx\include;$(ProjectDir)..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\Classes;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\spine-cpp\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks