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

Merge pull request #127 from liuliang2004/billboard 

Add a bulletin board test example
This commit is contained in:
XiaoYang 2014-09-04 17:00:29 +08:00
parent ed63f01c7e c42bef1f02
commit ec98779974
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/3d/CCBillBoard.h
View File

@ -26,7 +26,7 @@
#define __CCBILLBOARD_H__
#include "2d/CCSprite.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
/**

2
tests/cpp-tests/proj.win32/cpp-tests.vcxproj
View File

@ -137,6 +137,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\Classes\BaseTest.cpp" />
<ClCompile Include="..\Classes\BillBoardTest\BillBoardTest.cpp" />
<ClCompile Include="..\Classes\BugsTest\Bug-Child.cpp" />
<ClCompile Include="..\Classes\Camera3DTest\Camera3DTest.cpp" />
<ClCompile Include="..\Classes\ChipmunkTest\ChipmunkTest.cpp" />
@ -316,6 +317,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Classes\BaseTest.h" />
<ClInclude Include="..\Classes\BillBoardTest\BillBoardTest.h" />
<ClInclude Include="..\Classes\Box2DTestBed\Tests\ConvexHull.h" />
<ClInclude Include="..\Classes\Box2DTestBed\Tests\ConveyorBelt.h" />
<ClInclude Include="..\Classes\Box2DTestBed\Tests\Mobile.h" />

9
tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters
View File

@ -325,6 +325,9 @@
<Filter Include="Classes\Camera3DTest">
<UniqueIdentifier>{7f85be1c-98c5-4412-afc5-6f39ae1452a7}</UniqueIdentifier>
</Filter>
<Filter Include="Classes\BillBoardTest">
<UniqueIdentifier>{54a30b92-ddfb-420e-908b-886c23c21cf1}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
@ -858,6 +861,9 @@
<ClCompile Include="..\Classes\UITest\CocoStudioGUITest\UIEditBoxTest.cpp">
<Filter>Classes\UITest\CocostudioGUISceneTest</Filter>
</ClCompile>
<ClCompile Include="..\Classes\BillBoardTest\BillBoardTest.cpp">
<Filter>Classes\BillBoardTest</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="main.h">
@ -1589,5 +1595,8 @@
<ClInclude Include="..\Classes\UITest\CocoStudioGUITest\UIEditBoxTest.h">
<Filter>Classes\UITest\CocostudioGUISceneTest</Filter>
</ClInclude>
<ClInclude Include="..\Classes\BillBoardTest\BillBoardTest.h">
<Filter>Classes\BillBoardTest</Filter>
</ClInclude>
</ItemGroup>
</Project>