瀏覽代碼

Merge branch '3.7-beta' into 3.7-beta-cpp

badlogic 7 年之前
父節點
當前提交
393e0405c0
共有 2 個文件被更改,包括 1 次插入5 次删除
  1. 0 4
      spine-cpp/spine-cpp/src/spine/EventTimeline.cpp
  2. 1 1
      spine-sfml/cpp/example/main.cpp

+ 0 - 4
spine-cpp/spine-cpp/src/spine/EventTimeline.cpp

@@ -65,10 +65,6 @@ void EventTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vector
 
 
 	Vector<Event *> &events = *pEvents;
 	Vector<Event *> &events = *pEvents;
 
 
-	if (events.size() == 0) {
-		return;
-	}
-
 	size_t frameCount = _frames.size();
 	size_t frameCount = _frames.size();
 
 
 	if (lastTime > time) {
 	if (lastTime > time) {

+ 1 - 1
spine-sfml/cpp/example/main.cpp

@@ -433,10 +433,10 @@ int main () {
 	DebugExtension dbgExtension(SpineExtension::getInstance());
 	DebugExtension dbgExtension(SpineExtension::getInstance());
 	SpineExtension::setInstance(&dbgExtension);
 	SpineExtension::setInstance(&dbgExtension);
 
 
+	testcase(spineboy, "data/spineboy-ess.json", "data/spineboy-ess.skel", "data/spineboy.atlas", 0.6f);
 	testcase(raptor, "data/raptor-pro.json", "data/raptor-pro.skel", "data/raptor.atlas", 0.5f);
 	testcase(raptor, "data/raptor-pro.json", "data/raptor-pro.skel", "data/raptor.atlas", 0.5f);
 	testcase(coin, "data/coin-pro.json", "data/coin-pro.skel", "data/coin.atlas", 0.5f);
 	testcase(coin, "data/coin-pro.json", "data/coin-pro.skel", "data/coin.atlas", 0.5f);
 	testcase(test, "data/tank-pro.json", "data/tank-pro.skel", "data/tank.atlas", 1.0f);
 	testcase(test, "data/tank-pro.json", "data/tank-pro.skel", "data/tank.atlas", 1.0f);
-	testcase(spineboy, "data/spineboy-ess.json", "data/spineboy-ess.skel", "data/spineboy.atlas", 0.6f);
 	testcase(owl, "data/owl-pro.json", "data/owl-pro.skel", "data/owl.atlas", 0.5f);
 	testcase(owl, "data/owl-pro.json", "data/owl-pro.skel", "data/owl.atlas", 0.5f);
 	testcase(vine, "data/vine-pro.json", "data/vine-pro.skel", "data/vine.atlas", 0.5f);
 	testcase(vine, "data/vine-pro.json", "data/vine-pro.skel", "data/vine.atlas", 0.5f);
 	testcase(tank, "data/tank-pro.json", "data/tank-pro.skel", "data/tank.atlas", 0.2f);
 	testcase(tank, "data/tank-pro.json", "data/tank-pro.skel", "data/tank.atlas", 0.2f);