Merge pull request #19 from huaqo-games/huaqo
input performance, main menu cleanup
This commit is contained in:
+3
-2
@@ -31,8 +31,9 @@ void UpdateMouseScreen(Mouse *mouse){
|
|||||||
|
|
||||||
void UpdateMouse(Mouse *mouse, Camera2D *camera) {
|
void UpdateMouse(Mouse *mouse, Camera2D *camera) {
|
||||||
|
|
||||||
mouse->screenPosition = GetMousePosition();
|
Vector2 pos = GetMousePosition();
|
||||||
mouse->worldPosition = GetScreenToWorld2D(GetMousePosition(), *camera);
|
mouse->screenPosition = pos;
|
||||||
|
mouse->worldPosition = GetScreenToWorld2D(pos, *camera);
|
||||||
mouse->leftButton = IsMouseButtonDown(MOUSE_LEFT_BUTTON);
|
mouse->leftButton = IsMouseButtonDown(MOUSE_LEFT_BUTTON);
|
||||||
mouse->rightButton = IsMouseButtonDown(MOUSE_RIGHT_BUTTON);
|
mouse->rightButton = IsMouseButtonDown(MOUSE_RIGHT_BUTTON);
|
||||||
|
|
||||||
|
|||||||
@@ -151,7 +151,6 @@ void CleanupMenu(MenuState *m){
|
|||||||
for (int i = 0; i < MENU_SOUND_COUNT; i++){ UnloadSound(m->sounds[i]); }
|
for (int i = 0; i < MENU_SOUND_COUNT; i++){ UnloadSound(m->sounds[i]); }
|
||||||
for (int i = 0; i < MENU_TEX_COUNT; i++){ if (m->textures[i].id > 0) { UnloadTexture(m->textures[i]); } }
|
for (int i = 0; i < MENU_TEX_COUNT; i++){ if (m->textures[i].id > 0) { UnloadTexture(m->textures[i]); } }
|
||||||
for (int i = 0; i < MENU_SOUNDTRACK_COUNT; i++){ UnloadMusicStream(m->soundtracks[i].music); }
|
for (int i = 0; i < MENU_SOUNDTRACK_COUNT; i++){ UnloadMusicStream(m->soundtracks[i].music); }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // MENU_H
|
#endif // MENU_H
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ typedef struct {
|
|||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
Display display = {
|
Display display = {
|
||||||
.name = "The Last Hive",
|
.name = "The Last Hive",
|
||||||
.width = 1280,
|
.width = 1280,
|
||||||
@@ -65,6 +66,7 @@ int main(void)
|
|||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
CleanupMenu(&app.menu);
|
||||||
CleanupGame(&app.game);
|
CleanupGame(&app.game);
|
||||||
UnloadFont(app.font);
|
UnloadFont(app.font);
|
||||||
CloseWindow();
|
CloseWindow();
|
||||||
|
|||||||
Reference in New Issue
Block a user