Browse Source

fixed example

dmuratshin 10 years ago
parent
commit
4b2d834d83

+ 1 - 1
examples/Demo/proj.cmake/CMakeLists.txt

@@ -9,7 +9,7 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 add_executable(Demo ../src/Counter.cpp ../src/entry_point.cpp ../src/example.cpp ../src/test.cpp 
 	../src/Counter.h ../src/TestAlphaHitTest.h ../src/TestBox9Sprite.h ../src/TestClipRect.h
-	../src/TestColorFont.h ../src/TestTweenGlow.h ../src/TestCounter.h ../src/TestDrag.h ../src/TestHttp.h ../src/TestInputText.h ../src/TestManageRes.h ../src/TestMask.h ../src/TestPerf.h ../src/TestPolygon.h ../src/TestProgressBar.h ../src/TestRender2Texture.h ../src/TestSliding.h ../src/TestTexel2Pixel.h ../src/TestText.h ../src/TestTextureFormat.h ../src/TestTweenText.h ../src/TestTweens.h ../src/TestUserShader.h ../src/TestUserShader2.h ../src/TestAlphaFade.h ../src/example.h ../src/test.h )
+	../src/TestColorFont.h ../src/TestTweenGlow.h ../src/TestCounter.h ../src/TestDrag.h ../src/TestHttp.h ../src/TestInputText.h ../src/TestManageRes.h ../src/TestMask.h ../src/TestPerf.h ../src/TestPolygon.h ../src/TestProgressBar.h ../src/TestRender2Texture.h ../src/TestSliding.h ../src/TestTexel2Pixel.h ../src/TestText.h ../src/TestTextureFormat.h ../src/TestTweenText.h ../src/TestTweens.h ../src/TestUserShader.h ../src/TestUserShader2.h ../src/TestTweenAlphaFade.h ../src/example.h ../src/test.h )
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(Demo PROPERTIES WIN32_EXECUTABLE TRUE)

+ 3 - 1
examples/Demo/src/TestDrag.h

@@ -97,7 +97,9 @@ public:
     {
         spSprite actor = safeSpCast<Sprite>(event->currentTarget);
 
-        actor->removeTween(actor->getTween("color"));
+        spTween t = actor->getTween("color", ep_ignore_error);
+        if (t)
+            actor->removeTween(t);
         actor->setColor(Color::White);
     }
 };

+ 2 - 2
oxygine/src/TweenAlphaFade.h

@@ -114,8 +114,8 @@ namespace oxygine
             STDRenderer* renderer = STDMaterial::instance->getRenderer();
             rs.material = mat;
 
-			RectF clip = vp.cast<RectF>();
-			rs.clip = &clip;
+            RectF clip = vp.cast<RectF>();
+            rs.clip = &clip;
 
             renderer->initCoordinateSystem(vp.getWidth(), vp.getHeight(), true);