Merge branch 'master' of https://github.com/RandyGaul/cute_framework

RandyGaul · Dec 18, 2024 · 6edff22 · 6edff22
2 parents 4a50b34 + 6665a47
commit 6edff22
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/include/cute_sprite.h b/include/cute_sprite.h
@@ -534,20 +534,16 @@ CF_INLINE void cf_sprite_update(CF_Sprite* sprite)
 				if (sprite->frame_index < 0) {
 					if (sprite->loop) {
 						sprite->loop_count++;
-						sprite->frame_index = frame_count - 1;
-					} else  {
 						sprite->frame_index++;
+					} else  {
+						sprite->frame_index = 0;
 					}
 				}
 			} else {
 				sprite->frame_index++;
 				if (sprite->frame_index == frame_count) {
-					if (sprite->loop) {
-						sprite->loop_count++;
-						sprite->frame_index = 0;
-					} else {
-						sprite->frame_index--;
-					}
+					sprite->loop_count++;
+					sprite->frame_index--;
 				}
 			}
 		}

diff --git a/src/cute_graphics.cpp b/src/cute_graphics.cpp
@@ -1228,8 +1228,8 @@ void cf_destroy_shader(CF_Shader shader_handle)
 	// if it exists. See `cf_make_draw_shader`.
 	CF_Shader* blit = (CF_Shader*)draw->draw_shd_to_blit_shd.try_get(shader_handle.id);
 	if (blit) {
-		draw->draw_shd_to_blit_shd.remove(shader_handle.id);
 		cf_destroy_shader(*blit);
+		draw->draw_shd_to_blit_shd.remove(shader_handle.id);
 	}
 
 	CF_ShaderInternal* shd = (CF_ShaderInternal*)shader_handle.id;