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

Merge branch 'v3' into v3-winrt-librecast

This commit is contained in:
Dale Stammen 2015-06-16 07:13:53 -07:00
parent 511fe6a773 3f8923648b
commit eb2bc78970
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/2d/CCActionInterval.cpp
View File

@ -1464,7 +1464,7 @@ JumpTo* JumpTo::clone() const
{ {
// no copy constructor // no copy constructor
auto a = new (std::nothrow) JumpTo(); auto a = new (std::nothrow) JumpTo();
a->initWithDuration(_duration, _delta, _height, _jumps); a->initWithDuration(_duration, _endPosition, _height, _jumps);
a->autorelease(); a->autorelease();
return a; return a;
} }
@ -1814,7 +1814,8 @@ bool Blink::initWithDuration(float duration, int blinks)
void Blink::stop() void Blink::stop()
{ {
_target->setVisible(_originalState); if(NULL != _target)
_target->setVisible(_originalState);
ActionInterval::stop(); ActionInterval::stop();
} }

1
cocos/navmesh/CCNavMesh.cpp
View File

@ -485,7 +485,6 @@ void cocos2d::NavMesh::findPath(const Vec3 &start, const Vec3 &end, std::vector<
{ {
static const int MAX_POLYS = 256; static const int MAX_POLYS = 256;
static const int MAX_SMOOTH = 2048; static const int MAX_SMOOTH = 2048;
int pathIterNum = 0;
float ext[3]; float ext[3];
ext[0] = 2; ext[1] = 4; ext[2] = 2; ext[0] = 2; ext[1] = 4; ext[2] = 2;
dtQueryFilter filter; dtQueryFilter filter;

2
cocos/navmesh/CCNavMeshUtils.cpp
View File

@ -31,7 +31,7 @@
NS_CC_BEGIN NS_CC_BEGIN
LinearAllocator::LinearAllocator(const int cap) LinearAllocator::LinearAllocator(const int cap)
: buffer(0) : buffer(nullptr)
, capacity(0) , capacity(0)
, top(0) , top(0)
, high(0) , high(0)

20
templates/cpp-template-default/CMakeLists.txt
View File

@ -111,8 +111,16 @@ include_directories(
/usr/local/include/GLFW /usr/local/include/GLFW
/usr/include/GLFW /usr/include/GLFW
${COCOS2D_ROOT}/cocos ${COCOS2D_ROOT}/cocos
${COCOS2D_ROOT}/cocos/platform
${COCOS2D_ROOT}/cocos/audio/include/
Classes Classes
) )
if ( WIN32 )
include_directories(
${COCOS2D_ROOT}/external/glfw3/include/win32
${COCOS2D_ROOT}/external/win32-specific/gles/include/OGLES
)
endif( WIN32 )
set(GAME_SRC set(GAME_SRC
Classes/AppDelegate.cpp Classes/AppDelegate.cpp
@ -127,9 +135,17 @@ set(GAME_HEADERS
) )
if(GAME_HEADERS) if(GAME_HEADERS)
add_executable(${APP_NAME} ${GAME_SRC} ${GAME_HEADERS}) if ( WIN32 )
add_executable(${APP_NAME} WIN32 ${GAME_SRC} ${GAME_HEADERS})
else()
add_executable(${APP_NAME} ${GAME_SRC} ${GAME_HEADERS})
endif ( WIN32 )
else() else()
add_executable(${APP_NAME} ${GAME_SRC}) if ( WIN32 )
add_executable(${APP_NAME} WIN32 ${GAME_SRC})
else()
add_executable(${APP_NAME} ${GAME_SRC})
endif ( WIN32 )
endif() endif()
target_link_libraries(${APP_NAME} cocos2d) target_link_libraries(${APP_NAME} cocos2d)