Mario Zechner 1 anno fa
parent
commit
5e34031c1a

+ 2 - 2
spine-sdl/example/main.c

@@ -57,7 +57,7 @@ int main() {
 	drawable->skeleton->x = 400;
 	drawable->skeleton->x = 400;
 	drawable->skeleton->y = 500;
 	drawable->skeleton->y = 500;
 	spSkeleton_setToSetupPose(drawable->skeleton);
 	spSkeleton_setToSetupPose(drawable->skeleton);
-	spSkeletonDrawable_update(drawable, 0);
+	spSkeletonDrawable_update(drawable, 0, SP_PHYSICS_UPDATE);
 	spAnimationState_setAnimationByName(drawable->animationState, 0, "portal", 0);
 	spAnimationState_setAnimationByName(drawable->animationState, 0, "portal", 0);
 	spAnimationState_addAnimationByName(drawable->animationState, 0, "run", -1, 0);
 	spAnimationState_addAnimationByName(drawable->animationState, 0, "run", -1, 0);
 
 
@@ -79,7 +79,7 @@ int main() {
 		double deltaTime = (now - lastFrameTime) / (double) SDL_GetPerformanceFrequency();
 		double deltaTime = (now - lastFrameTime) / (double) SDL_GetPerformanceFrequency();
 		lastFrameTime = now;
 		lastFrameTime = now;
 
 
-		spSkeletonDrawable_update(drawable, deltaTime);
+		spSkeletonDrawable_update(drawable, deltaTime, SP_PHYSICS_UPDATE);
 		spSkeletonDrawable_draw(drawable, renderer);
 		spSkeletonDrawable_draw(drawable, renderer);
 
 
 		SDL_RenderPresent(renderer);
 		SDL_RenderPresent(renderer);

+ 2 - 2
spine-sdl/example/main.cpp

@@ -57,7 +57,7 @@ int main(int argc, char **argv) {
 	drawable.animationState->getData()->setDefaultMix(0.2f);
 	drawable.animationState->getData()->setDefaultMix(0.2f);
 	drawable.skeleton->setPosition(400, 500);
 	drawable.skeleton->setPosition(400, 500);
 	drawable.skeleton->setToSetupPose();
 	drawable.skeleton->setToSetupPose();
-	drawable.update(0);
+	drawable.update(0, spine::Physics_Update);
 	drawable.animationState->setAnimation(0, "portal", true);
 	drawable.animationState->setAnimation(0, "portal", true);
 	drawable.animationState->addAnimation(0, "run", true, 0);
 	drawable.animationState->addAnimation(0, "run", true, 0);
 
 
@@ -79,7 +79,7 @@ int main(int argc, char **argv) {
 		double deltaTime = (now - lastFrameTime) / (double) SDL_GetPerformanceFrequency();
 		double deltaTime = (now - lastFrameTime) / (double) SDL_GetPerformanceFrequency();
 		lastFrameTime = now;
 		lastFrameTime = now;
 
 
-		drawable.update(deltaTime);
+		drawable.update(deltaTime, spine::Physics_Update);
 		drawable.draw(renderer);
 		drawable.draw(renderer);
 
 
 		SDL_RenderPresent(renderer);
 		SDL_RenderPresent(renderer);

+ 2 - 2
spine-sdl/src/spine-sdl-c.c

@@ -59,10 +59,10 @@ void spSkeletonDrawable_dispose(spSkeletonDrawable *self) {
 	FREE(self);
 	FREE(self);
 }
 }
 
 
-void spSkeletonDrawable_update(spSkeletonDrawable *self, float delta) {
+void spSkeletonDrawable_update(spSkeletonDrawable *self, float delta, spPhysics physics) {
 	spAnimationState_update(self->animationState, delta);
 	spAnimationState_update(self->animationState, delta);
 	spAnimationState_apply(self->animationState, self->skeleton);
 	spAnimationState_apply(self->animationState, self->skeleton);
-	spSkeleton_updateWorldTransform(self->skeleton);
+	spSkeleton_updateWorldTransform(self->skeleton, physics);
 }
 }
 
 
 void spSkeletonDrawable_draw(spSkeletonDrawable *self, struct SDL_Renderer *renderer) {
 void spSkeletonDrawable_draw(spSkeletonDrawable *self, struct SDL_Renderer *renderer) {

+ 1 - 1
spine-sdl/src/spine-sdl-c.h

@@ -54,7 +54,7 @@ SP_API spSkeletonDrawable *spSkeletonDrawable_create(spSkeletonData *skeletonDat
 
 
 SP_API void spSkeletonDrawable_dispose(spSkeletonDrawable *self);
 SP_API void spSkeletonDrawable_dispose(spSkeletonDrawable *self);
 
 
-SP_API void spSkeletonDrawable_update(spSkeletonDrawable *self, float delta);
+SP_API void spSkeletonDrawable_update(spSkeletonDrawable *self, float delta, spPhysics physics);
 
 
 SP_API void spSkeletonDrawable_draw(spSkeletonDrawable *self, struct SDL_Renderer *renderer);
 SP_API void spSkeletonDrawable_draw(spSkeletonDrawable *self, struct SDL_Renderer *renderer);
 
 

+ 1 - 1
spine-sdl/src/spine-sdl-cpp.h

@@ -40,7 +40,7 @@ namespace spine {
 
 
 		~SkeletonDrawable();
 		~SkeletonDrawable();
 
 
-		void update(float delta);
+		void update(float delta, Physics physics);
 
 
 		void draw(SDL_Renderer *renderer);
 		void draw(SDL_Renderer *renderer);