Skip to content

[cpp test-Android、mac]46：Node：Sprite3D->25 crash #19198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 22, 2018
Merged

[cpp test-Android、mac]46：Node：Sprite3D->25 crash #19198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions build/cocos2d_tests.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7568,6 +7568,7 @@
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-empty-test/project/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
Expand Down Expand Up @@ -7598,6 +7599,7 @@
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-empty-test/project/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
Expand Down Expand Up @@ -8263,7 +8265,7 @@
"CC_ENABLE_CHIPMUNK_INTEGRATION=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
Expand Down Expand Up @@ -8291,7 +8293,7 @@
"CC_ENABLE_CHIPMUNK_INTEGRATION=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
Expand Down
12 changes: 9 additions & 3 deletions tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2295,8 +2295,7 @@ Animate3DCallbackTest::Animate3DCallbackTest()

ValueMap valuemap0;
animate->setKeyFrameUserInfo(275, valuemap0);

auto listener = EventListenerCustom::create(Animate3DDisplayedNotification, [&](EventCustom* event)
_customEventListener = EventListenerCustom::create(Animate3DDisplayedNotification, [&](EventCustom* event)
{
auto info = (Animate3D::Animate3DDisplayedEventInfo*)event->getUserData();
auto node = getChildByTag(100);
Expand All @@ -2310,12 +2309,19 @@ Animate3DCallbackTest::Animate3DCallbackTest()

cocos2d::log("frame %d", info->frame);
});
Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(listener, -1);
Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_customEventListener, -1);
}
}

Animate3DCallbackTest::~Animate3DCallbackTest()
{
cocos2d::log("Animate3DCallbackTest destroied!");
if(_customEventListener)
{
Director::getInstance()->getEventDispatcher()->removeEventListener(_customEventListener);
_customEventListener = nullptr;
}

}

std::string Animate3DCallbackTest::title() const
Expand Down
1 change: 1 addition & 0 deletions tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,7 @@ class Animate3DCallbackTest : public Sprite3DTestDemo

protected:
cocos2d::Sprite3D* _sprite3d;
cocos2d::EventListenerCustom *_customEventListener = nullptr;
};

class Sprite3DTestMeshLight : public Sprite3DTestDemo
Expand Down