refactor: appTypes.c to app.h

include/app.h

@@ -153,10 +153,28 @@ typedef enum
 	ENEMIES_TEX_COUNT
 } enemiesTextureID;
 
+typedef enum
+{
+	START,
+	SHIP_COUNT
+} shipID;
+
+typedef struct
+{
+	int id;
+	char* assetPath;
+	int frameSize;
+	int speed0;
+	int speed1;
+	int speed2;
+	int rotationSpeed;
+}Ship;
+
 #define MAX_ENEMIES 100
 
 typedef struct 
 {
+	Config config;
 	int count;
 	Sprite sprite[MAX_ENEMIES];
 	Animation animation[MAX_ENEMIES];

src/app.c

@@ -1,6 +1,4 @@
-#include <engine.h>
+#include "app.h"
-
-#include "appTypes.h"
 
 void ConfigApp(App* app){
     InitConfig(&app->config, "config/config.ini");

src/appGame.c

@@ -1,5 +1,4 @@
-#include "engine.h"
+#include "app.h"
-#include "appTypes.h"
 
 const ShaderAsset shaderAssets[SHADER_COUNT] = {
     {"shaders/postfx.fs"}

src/appGameBirds.c

@@ -1,5 +1,4 @@
-#include "appTypes.h"
+#include "app.h"
-#include "engine.h"
 
 
 const TextureAsset birdsTextureAssets[BIRDS_TEX_COUNT] = {

src/appGameEnemies.c

@@ -1,5 +1,6 @@
-#include "appTypes.h"
+#include "app.h"
-#include "engine.h"
+
+
 
 const TextureAsset enemiesTextureAssets[ENEMIES_TEX_COUNT] = {
 	{"assets/ship_start.png", 16.0f, 16.0f, 90.0f}

src/appGameFloor.c

@@ -1,5 +1,4 @@
-#include "engine.h"
+#include "app.h"
-#include "appTypes.h"
 
 Floor CreateFloor(void)
 {

src/appGameIslands.c

@@ -1,4 +1,4 @@
-#include "appTypes.h"
+#include "app.h"
 
 const TextureAsset islandsTextureAssets[ISLANDS_TEX_COUNT] = {
 	{"assets/island.png", 16.0f, 16.0f, 0.0f}

src/appGamePlayer.c

@@ -1,4 +1,4 @@
-#include "appTypes.h"
+#include "app.h"
 
 const TextureAsset playerTextureAssets[PLAYER_TEX_COUNT] = {
     {"assets/ship_start.png", 16.0f, 16.0f, 0.0f}

src/appGameShoot.c

@@ -1,3 +1,3 @@
-#include "appTypes.h"
+#include "app.h"
 
 

src/appLogo.c

@@ -1,4 +1,4 @@
-#include "appTypes.h"
+#include "app.h"
 
 void InitLogo(LogoState *l) {
     SetTargetFPS(60);

src/appMenu.c

@@ -1,4 +1,4 @@
-#include "appTypes.h"
+#include "app.h"
 
 void InitMenu(MenuState *m)
 {

src/appMenuMain.c

@@ -1,4 +1,4 @@
-#include "appTypes.h"
+#include "app.h"
 
 
 const TextureAsset menuTextureAssets[MENU_TEX_COUNT] = {

src/appMenuMainBackground.c

@@ -1,4 +1,4 @@
-#include "appTypes.h"
+#include "app.h"
 
 void InitBackground(float scrollSpeed, Background *bg, Texture2D *texture, const TextureAsset *backgroundAsset){
     bg->scrolling = 0.0f;

src/appMenuSettings.c

@@ -1,4 +1,4 @@
-#include "appTypes.h"
+#include "app.h"
 
 void InitMenuSettings(MenuSettings *s)
 {

src/appState.c

@@ -1,4 +1,4 @@
-#include "appTypes.h"
+#include "app.h"
 
 void OnEscapeChangeView(App *app, View view)
 {	

src/main.c

@@ -1,4 +1,4 @@
-#include "appTypes.h"
+#include "app.h"
 
 int main(void)
 {