aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornathansmithsmith <nathansmith7@mailfence.com>2023-11-05 00:07:55 -0600
committernathansmithsmith <nathansmith7@mailfence.com>2023-11-05 00:07:55 -0600
commit451887dabd71b6b9b8cdf2587fee31ec59c3675b (patch)
tree0129a76d755c222dd62cd418f184ed1c7254aa79
parentf45d32ca36a0ae85410b3eee61120fa97bf9bd25 (diff)
Started working on cool stars
-rw-r--r--assets/sky.mtl12
-rw-r--r--assets/sky.obj280
-rw-r--r--assets/skyTexture.pngbin0 -> 7192 bytes
-rw-r--r--src/assets.c13
-rw-r--r--src/assets.h8
-rw-r--r--src/game.c9
-rw-r--r--src/gameCommon.h4
-rw-r--r--src/gameScreen.c63
-rw-r--r--src/gameScreen.h5
-rw-r--r--src/levels/level1.c2
-rw-r--r--src/settings.c4
11 files changed, 378 insertions, 22 deletions
diff --git a/assets/sky.mtl b/assets/sky.mtl
new file mode 100644
index 0000000..4429a90
--- /dev/null
+++ b/assets/sky.mtl
@@ -0,0 +1,12 @@
+# Blender 3.6.4 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd skyTexture.png
diff --git a/assets/sky.obj b/assets/sky.obj
new file mode 100644
index 0000000..f6fec0f
--- /dev/null
+++ b/assets/sky.obj
@@ -0,0 +1,280 @@
+# Blender 3.6.4
+# www.blender.org
+mtllib sky.mtl
+o Icosphere
+v 0.000000 -1.000000 0.000000
+v 0.723607 -0.447220 0.525725
+v -0.276388 -0.447220 0.850649
+v -0.894426 -0.447216 0.000000
+v -0.276388 -0.447220 -0.850649
+v 0.723607 -0.447220 -0.525725
+v 0.276388 0.447220 0.850649
+v -0.723607 0.447220 0.525725
+v -0.723607 0.447220 -0.525725
+v 0.276388 0.447220 -0.850649
+v 0.894426 0.447216 -0.000000
+v 0.000000 1.000000 -0.000000
+v -0.162456 -0.850654 0.499995
+v 0.425323 -0.850654 0.309011
+v 0.262869 -0.525738 0.809012
+v 0.850648 -0.525736 0.000000
+v 0.425323 -0.850654 -0.309011
+v -0.525730 -0.850652 0.000000
+v -0.688189 -0.525736 0.499997
+v -0.162456 -0.850654 -0.499995
+v -0.688189 -0.525736 -0.499997
+v 0.262869 -0.525738 -0.809012
+v 0.951058 0.000000 0.309013
+v 0.951058 -0.000000 -0.309013
+v 0.000000 0.000000 1.000000
+v 0.587786 0.000000 0.809017
+v -0.951058 0.000000 0.309013
+v -0.587786 0.000000 0.809017
+v -0.587786 -0.000000 -0.809017
+v -0.951058 -0.000000 -0.309013
+v 0.587786 -0.000000 -0.809017
+v 0.000000 -0.000000 -1.000000
+v 0.688189 0.525736 0.499997
+v -0.262869 0.525738 0.809012
+v -0.850648 0.525736 -0.000000
+v -0.262869 0.525738 -0.809012
+v 0.688189 0.525736 -0.499997
+v 0.162456 0.850654 0.499995
+v 0.525730 0.850652 -0.000000
+v -0.425323 0.850654 0.309011
+v -0.425323 0.850654 -0.309011
+v 0.162456 0.850654 -0.499995
+vn -0.1024 0.9435 -0.3151
+vn -0.7002 0.6617 -0.2680
+vn 0.2680 0.9435 -0.1947
+vn 0.2680 0.9435 0.1947
+vn -0.1024 0.9435 0.3151
+vn -0.9050 0.3304 -0.2680
+vn -0.0247 0.3304 -0.9435
+vn 0.8897 0.3304 -0.3151
+vn 0.5746 0.3304 0.7488
+vn -0.5346 0.3304 0.7779
+vn -0.8026 0.1256 -0.5831
+vn 0.3066 0.1256 -0.9435
+vn 0.9921 0.1256 -0.0000
+vn 0.3066 0.1256 0.9435
+vn -0.8026 0.1256 0.5831
+vn -0.4089 -0.6617 -0.6284
+vn 0.4713 -0.6617 -0.5831
+vn 0.7002 -0.6617 0.2680
+vn -0.0385 -0.6617 0.7488
+vn -0.7240 -0.6617 0.1947
+vn -0.2680 -0.9435 0.1947
+vn -0.4911 -0.7947 0.3568
+vn -0.4089 -0.6617 0.6284
+vn 0.1024 -0.9435 0.3151
+vn 0.1876 -0.7947 0.5773
+vn 0.4713 -0.6617 0.5831
+vn 0.3313 -0.9435 -0.0000
+vn 0.6071 -0.7947 -0.0000
+vn 0.7002 -0.6617 -0.2680
+vn 0.1024 -0.9435 -0.3151
+vn 0.1876 -0.7947 -0.5773
+vn -0.0385 -0.6617 -0.7488
+vn -0.2680 -0.9435 -0.1947
+vn -0.4911 -0.7947 -0.3568
+vn -0.7240 -0.6617 -0.1947
+vn -0.8897 -0.3304 0.3151
+vn -0.7947 -0.1876 0.5773
+vn -0.5746 -0.3304 0.7488
+vn 0.0247 -0.3304 0.9435
+vn 0.3035 -0.1876 0.9342
+vn 0.5346 -0.3304 0.7779
+vn 0.9050 -0.3304 0.2680
+vn 0.9822 -0.1876 -0.0000
+vn 0.9050 -0.3304 -0.2680
+vn 0.5346 -0.3304 -0.7779
+vn 0.3035 -0.1876 -0.9342
+vn 0.0247 -0.3304 -0.9435
+vn -0.5746 -0.3304 -0.7488
+vn -0.7947 -0.1876 -0.5773
+vn -0.8897 -0.3304 -0.3151
+vn -0.3066 -0.1256 0.9435
+vn -0.3035 0.1876 0.9342
+vn -0.0247 0.3304 0.9435
+vn 0.8026 -0.1256 0.5831
+vn 0.7947 0.1876 0.5773
+vn 0.8897 0.3304 0.3151
+vn 0.8026 -0.1256 -0.5831
+vn 0.7947 0.1876 -0.5773
+vn 0.5746 0.3304 -0.7488
+vn -0.3066 -0.1256 -0.9435
+vn -0.3035 0.1876 -0.9342
+vn -0.5346 0.3304 -0.7779
+vn -0.9921 -0.1256 -0.0000
+vn -0.9822 0.1876 -0.0000
+vn -0.9050 0.3304 0.2680
+vn -0.4713 0.6617 0.5831
+vn -0.1876 0.7947 0.5773
+vn 0.0385 0.6617 0.7488
+vn 0.4089 0.6617 0.6284
+vn 0.4911 0.7947 0.3568
+vn 0.7240 0.6617 0.1947
+vn 0.7240 0.6617 -0.1947
+vn 0.4911 0.7947 -0.3568
+vn 0.4089 0.6617 -0.6284
+vn -0.7002 0.6617 0.2680
+vn -0.6071 0.7947 -0.0000
+vn -0.3313 0.9435 -0.0000
+vn 0.0385 0.6617 -0.7488
+vn -0.1876 0.7947 -0.5773
+vn -0.4713 0.6617 -0.5831
+vt 0.582086 0.606267
+vt 0.656542 0.514523
+vt 0.528628 0.491218
+vt 0.463622 0.394392
+vt 0.385947 0.491217
+vt 0.662549 0.653464
+vt 0.538345 0.716027
+vt 0.455579 0.615753
+vt 0.356047 0.389986
+vt 0.109644 0.315814
+vt 0.003996 0.265185
+vt 0.071436 0.381993
+vt 0.322371 0.192995
+vt 0.222233 0.120804
+vt 0.222233 0.265186
+vt 0.913132 0.605961
+vt 0.863817 0.489072
+vt 0.786365 0.610923
+vt 0.444991 0.315815
+vt 0.432540 0.192995
+vt 0.339343 0.265188
+vt 0.806457 0.328100
+vt 0.867964 0.229014
+vt 0.725372 0.234110
+vt 0.097194 0.192994
+vt 0.331350 0.076188
+vt 0.990818 0.516933
+vt 0.557579 0.265186
+vt 0.917279 0.112125
+vt 0.869645 0.003996
+vt 0.790512 0.107163
+vt 0.003996 0.499748
+vt 0.120233 0.490260
+vt 0.060318 0.389986
+vt 0.128276 0.711621
+vt 0.193282 0.614796
+vt 0.050601 0.614797
+vt 0.444990 0.070175
+vt 0.541659 0.003997
+vt 0.406782 0.003996
+vt 0.657717 0.192994
+vt 0.666696 0.076187
+vt 0.557579 0.120803
+vt 0.327203 0.452549
+vt 0.246740 0.499746
+vt 0.321196 0.591490
+vt 0.251566 0.716027
+vt 0.202999 0.389986
+vt 0.996004 0.062084
+vt 0.727054 0.009093
+vt 0.674689 0.120796
+vt 0.339343 0.120805
+vt 0.925678 0.389986
+vt 0.802310 0.389986
+vt 0.020701 0.716028
+vt 0.206312 0.003996
+vt 0.109645 0.070175
+vt 0.003997 0.120801
+vt 0.994965 0.201153
+vt 0.991857 0.656002
+vt 0.721225 0.483976
+vt 0.670542 0.597290
+vt 0.929825 0.328100
+vt 0.666696 0.309801
+vt 0.541658 0.381993
+vt 0.339342 0.606266
+vt 0.395664 0.716028
+vt 0.865498 0.714090
+vt 0.722907 0.708993
+vt 0.331350 0.309802
+vt 0.206312 0.381993
+vt 0.586911 0.389986
+s 0
+usemtl Material.001
+f 1/1/1 13/2/1 14/3/1
+f 2/4/2 16/5/2 14/3/2
+f 1/1/3 18/6/3 13/2/3
+f 1/1/4 20/7/4 18/6/4
+f 1/1/5 17/8/5 20/7/5
+f 2/4/6 23/9/6 16/5/6
+f 3/10/7 25/11/7 15/12/7
+f 4/13/8 27/14/8 19/15/8
+f 5/16/9 29/17/9 21/18/9
+f 6/19/10 31/20/10 22/21/10
+f 2/22/11 26/23/11 23/24/11
+f 3/10/12 28/25/12 25/11/12
+f 4/13/13 30/26/13 27/14/13
+f 5/16/14 32/27/14 29/17/14
+f 6/19/15 24/28/15 31/20/15
+f 7/29/16 38/30/16 33/31/16
+f 8/32/17 40/33/17 34/34/17
+f 9/35/18 41/36/18 35/37/18
+f 10/38/19 42/39/19 36/40/19
+f 11/41/20 39/42/20 37/43/20
+f 39/44/21 12/45/21 42/46/21
+f 39/42/22 42/39/22 37/43/22
+f 37/43/23 42/39/23 10/38/23
+f 42/46/24 12/45/24 41/36/24
+f 42/46/25 41/36/25 36/47/25
+f 36/47/26 41/36/26 9/35/26
+f 41/36/27 12/45/27 40/33/27
+f 41/36/28 40/33/28 35/37/28
+f 35/37/29 40/33/29 8/32/29
+f 40/33/30 12/45/30 38/48/30
+f 40/33/31 38/48/31 34/34/31
+f 34/49/32 38/30/32 7/29/32
+f 38/48/33 12/45/33 39/44/33
+f 38/30/34 39/50/34 33/31/34
+f 33/31/35 39/50/35 11/51/35
+f 24/28/36 11/41/36 37/43/36
+f 24/28/37 37/43/37 31/20/37
+f 31/20/38 37/43/38 10/38/38
+f 32/52/39 10/38/39 36/40/39
+f 32/27/40 36/53/40 29/17/40
+f 29/17/41 36/53/41 9/54/41
+f 30/55/42 9/35/42 35/37/42
+f 30/26/43 35/56/43 27/14/43
+f 27/14/44 35/56/44 8/57/44
+f 28/25/45 8/57/45 34/58/45
+f 28/25/46 34/58/46 25/11/46
+f 25/59/47 34/49/47 7/29/47
+f 26/23/48 7/29/48 33/31/48
+f 26/23/49 33/31/49 23/24/49
+f 23/24/50 33/31/50 11/51/50
+f 31/20/51 10/38/51 32/52/51
+f 31/20/52 32/52/52 22/21/52
+f 22/60/53 32/27/53 5/16/53
+f 29/17/54 9/54/54 30/61/54
+f 29/17/55 30/61/55 21/18/55
+f 21/18/56 30/61/56 4/62/56
+f 27/14/57 8/57/57 28/25/57
+f 27/14/58 28/25/58 19/15/58
+f 19/15/59 28/25/59 3/10/59
+f 25/59/60 7/29/60 26/23/60
+f 25/59/61 26/23/61 15/63/61
+f 15/63/62 26/23/62 2/22/62
+f 23/64/63 11/41/63 24/28/63
+f 23/64/64 24/28/64 16/65/64
+f 16/65/65 24/28/65 6/19/65
+f 17/8/66 6/66/66 22/67/66
+f 17/8/67 22/67/67 20/7/67
+f 20/68/68 22/60/68 5/16/68
+f 20/68/69 5/16/69 21/18/69
+f 20/68/70 21/18/70 18/69/70
+f 18/69/71 21/18/71 4/62/71
+f 18/70/72 4/13/72 19/15/72
+f 18/70/73 19/15/73 13/71/73
+f 13/71/74 19/15/74 3/10/74
+f 16/5/75 6/66/75 17/8/75
+f 16/5/76 17/8/76 14/3/76
+f 14/3/77 17/8/77 1/1/77
+f 13/71/78 3/10/78 15/12/78
+f 13/2/79 15/72/79 14/3/79
+f 14/3/80 15/72/80 2/4/80
diff --git a/assets/skyTexture.png b/assets/skyTexture.png
new file mode 100644
index 0000000..b6040ba
--- /dev/null
+++ b/assets/skyTexture.png
Binary files differ
diff --git a/src/assets.c b/src/assets.c
index cc6a7b0..bdd0d8d 100644
--- a/src/assets.c
+++ b/src/assets.c
@@ -4,7 +4,8 @@ const char textureAssetPaths[TEXTURE_ASSET_COUNT][ASSET_PATH_MAX] = {
"/home/nathan/Documents/KillaFacsista/assets/icon.png",
"/home/nathan/Documents/KillaFacsista/assets/icon128.png",
"/home/nathan/Documents/KillaFacsista/assets/icon64.png",
- "/home/nathan/Documents/KillaFacsista/assets/gyroscope.png"
+ "/home/nathan/Documents/KillaFacsista/assets/gyroscope.png",
+ "/home/nathan/Documents/KillaFacsista/assets/skyTexture.png"
};
const char modelAssetPaths[MODEL_ASSET_COUNT][ASSET_PATH_MAX] = {
@@ -17,7 +18,8 @@ const char modelAssetPaths[MODEL_ASSET_COUNT][ASSET_PATH_MAX] = {
"/home/nathan/Documents/KillaFacsista/assets/mussolini.obj",
"/home/nathan/Documents/KillaFacsista/assets/guidedMissile.obj",
"/home/nathan/Documents/KillaFacsista/assets/missile.obj",
- "/home/nathan/Documents/KillaFacsista/assets/gyroscope.obj"
+ "/home/nathan/Documents/KillaFacsista/assets/gyroscope.obj",
+ "/home/nathan/Documents/KillaFacsista/assets/sky.obj"
};
// Some models have textures and other stuff to be set.
@@ -28,6 +30,13 @@ void configModelAssets(Assets * assets) {
MATERIAL_MAP_DIFFUSE,
assets->textures[GYROSCOPE_TEXTURE_ASSET]
);
+
+ // Sky.
+ SetMaterialTexture(
+ &assets->models[SKY_ASSET].materials[0],
+ MATERIAL_MAP_DIFFUSE,
+ assets->textures[SKY_TEXTURE_ASSET]
+ );
}
void LoadAssets(Assets * assets) {
diff --git a/src/assets.h b/src/assets.h
index beeb672..e3d7ca2 100644
--- a/src/assets.h
+++ b/src/assets.h
@@ -5,8 +5,8 @@
#define ASSET_PATH_MAX 255
-#define TEXTURE_ASSET_COUNT 4
-#define MODEL_ASSET_COUNT 10
+#define TEXTURE_ASSET_COUNT 5
+#define MODEL_ASSET_COUNT 11
// Paths to assets.
extern const char textureAssetPaths[TEXTURE_ASSET_COUNT][ASSET_PATH_MAX];
@@ -20,6 +20,7 @@ enum {
ICON128_ASSET,
ICON64_ASSET,
GYROSCOPE_TEXTURE_ASSET,
+ SKY_TEXTURE_ASSET
};
// Model asset ids.
@@ -33,7 +34,8 @@ enum {
MUSSOLINI_ASSET,
GUIDED_MISSILE_ASSET,
MISSILE_ASSET,
- GYROSCOPE_ASSET
+ GYROSCOPE_ASSET,
+ SKY_ASSET
};
typedef struct Assets {
diff --git a/src/game.c b/src/game.c
index 7973807..764e2fa 100644
--- a/src/game.c
+++ b/src/game.c
@@ -4,6 +4,8 @@ void initGame(Game * game) {
// Window.
InitWindow(WINDOW_WIDTH, WINDOW_HEIGHT, "Killa Facsista");
+ SetWindowState(FLAG_WINDOW_RESIZABLE);
+
// Settings.
initSettings(&game->settings);
applySettings(&game->settings);
@@ -64,6 +66,10 @@ void closeGame(Game * game) {
CloseWindow();
}
+void gameResize(Game * game) {
+ resizeGameScreen(game, &game->gameScreen);
+}
+
void updateGame(Game * game) {
BeginDrawing();
@@ -81,5 +87,8 @@ void updateGame(Game * game) {
if (game->settings.drawFps)
DrawFPS(5, 5);
+ if (IsWindowResized())
+ gameResize(game);
+
EndDrawing();
}
diff --git a/src/gameCommon.h b/src/gameCommon.h
index 0186e35..2c655e3 100644
--- a/src/gameCommon.h
+++ b/src/gameCommon.h
@@ -25,8 +25,8 @@ typedef struct Entity Entity;
// How far from center you can go.
#define GAME_BOUNDS 1000.0
-#define WINDOW_WIDTH 960
-#define WINDOW_HEIGHT 540
+#define WINDOW_WIDTH 1280
+#define WINDOW_HEIGHT 720
// Memory management.
#define KF_MALLOC(size) malloc(size)
diff --git a/src/gameScreen.c b/src/gameScreen.c
index 8cb9424..036107d 100644
--- a/src/gameScreen.c
+++ b/src/gameScreen.c
@@ -14,7 +14,7 @@ void initGameScreenGui(GameScreen * gameScreen) {
gameScreen->targetInfoPosition = (Vector2){
width - (GAME_SCREEN_TEXT_SIZE * (GAME_SCREEN_TARGET_INFO_MAX / 2.0)),
- height / 3.0
+ height - RADAR_TEXTURE_SIZE - (GAME_SCREEN_TEXT_SIZE * 4.0)
};
gameScreen->zoomViewPosition = (Vector2){width - GAME_SCREEN_ZOOM_VIEW_UI_SIZE - 20.0, 10.0};
@@ -160,7 +160,7 @@ void drawGameScreenGui(Game * game) {
GameScreen * gameScreen = &game->gameScreen;
// Draw cross hair.
- if (gameScreen->mainCamera == FIRST_PERSON_CAMERA) {
+ if (gameScreen->mainCamera == FIRST_PERSON_CAMERA || gameScreen->mainCamera == ZOOM_CAMERA) {
// Get color depending if on target or not.
Entity * player = getEntityFromWorld(game->world, 0);
AntifaShip * data = (AntifaShip*)player->data;
@@ -243,9 +243,41 @@ void gameScreenHandleLevels(Game * game, GameScreen * gameScreen) {
}
}
+void renderStars(Game * game) {
+ Entity * player = getEntityFromWorld(game->world, 0);
+
+ float starSpacing = 30.0;
+
+ Vector3 startPosition = player->position;
+ startPosition = Vector3Scale(startPosition, 1.0 / starSpacing);
+ startPosition = (Vector3){(int)startPosition.x, (int)startPosition.y, (int)startPosition.z};
+ startPosition = Vector3Scale(startPosition, starSpacing);
+
+ Vector3 endAt = Vector3Subtract(player->position, startPosition);
+ endAt = Vector3Zero();
+ endAt = Vector3AddValue(endAt, 200.0);
+
+ for (float z = -endAt.z; z < endAt.z; z += starSpacing) {
+ for (float y = -endAt.y; y < endAt.y; y += starSpacing) {
+ for (float x = -endAt.x; x < endAt.x; x += starSpacing) {
+ Vector3 starPosition = Vector3Add((Vector3){x, y, z}, startPosition);
+ float starDistance = Vector3Distance(player->position, starPosition);
+
+ if (starDistance < 100.0)
+ continue;
+
+ DrawPoint3D(starPosition, (Color){0xff, 0xff, 0xff, 0xff - (starDistance * 10.0)});
+ }
+ }
+ }
+}
+
void renderWorldGameScreen(Game * game, GameScreen * gameScreen) {
BeginMode3D(game->cameras[gameScreen->mainCamera]);
+ //DrawModel(game->assets.models[SKY_ASSET], Vector3Zero(), 500.0, WHITE);
+ renderStars(game);
+
// Draw world.
drawWorld(&game->world, game);
@@ -253,14 +285,19 @@ void renderWorldGameScreen(Game * game, GameScreen * gameScreen) {
}
void drawZoomViewGameScreen(Game * game, GameScreen * gameScreen) {
+ CameraId cameraId = ZOOM_CAMERA;
+
+ if (gameScreen->mainCamera == ZOOM_CAMERA)
+ cameraId = THIRD_PERSON_CAMERA;
+
// Update camera.
- runCameraUpdate(game, game->cameras, ZOOM_CAMERA);
+ runCameraUpdate(game, game->cameras, cameraId);
// Render onto texture.
BeginTextureMode(gameScreen->zoomViewTexture);
ClearBackground(BLACK);
- BeginMode3D(game->cameras[ZOOM_CAMERA]);
+ BeginMode3D(game->cameras[cameraId]);
drawWorld(&game->world, game);
EndMode3D();
@@ -282,14 +319,16 @@ void drawZoomViewGameScreen(Game * game, GameScreen * gameScreen) {
);
// Draw cross hair.
- float halfSize = GAME_SCREEN_ZOOM_VIEW_UI_SIZE / 2.0;
- Vector2 crossHairPosition = Vector2Add(gameScreen->zoomViewPosition, (Vector2){halfSize, halfSize});
+ if (cameraId == ZOOM_CAMERA) {
+ float halfSize = GAME_SCREEN_ZOOM_VIEW_UI_SIZE / 2.0;
+ Vector2 crossHairPosition = Vector2Add(gameScreen->zoomViewPosition, (Vector2){halfSize, halfSize});
- Entity * player = getEntityFromWorld(game->world, 0);
- AntifaShip * data = (AntifaShip*)player->data;
- Color color = data->isOnTarget ? RED : BLUE;
+ Entity * player = getEntityFromWorld(game->world, 0);
+ AntifaShip * data = (AntifaShip*)player->data;
+ Color color = data->isOnTarget ? RED : BLUE;
- drawCrossHairPosition(crossHairPosition, 4.0, 2.0, color);
+ drawCrossHairPosition(crossHairPosition, 4.0, 2.0, color);
+ }
// Draw outline.
DrawRectangleLines(
@@ -345,6 +384,10 @@ void updateGameScreen(Game * game) {
drawGameScreenGui(game);
}
+void resizeGameScreen(Game * game, GameScreen * gameScreen) {
+ initGameScreenGui(gameScreen);
+}
+
void openGameScreen(Game * game) {
game->screenId = SCREEN_GAME;
diff --git a/src/gameScreen.h b/src/gameScreen.h
index 009ba07..112897c 100644
--- a/src/gameScreen.h
+++ b/src/gameScreen.h
@@ -10,8 +10,8 @@
#define GAME_SCREEN_NEXT_LEVEL_DELAY 2.0
#define GAME_SCREEN_TARGET_INFO_MAX 20
-#define GAME_SCREEN_ZOOM_VIEW_SIZE 60 // Size it renders at.
-#define GAME_SCREEN_ZOOM_VIEW_UI_SIZE 150 // Size on screen.
+#define GAME_SCREEN_ZOOM_VIEW_SIZE 100 // Size it renders at.
+#define GAME_SCREEN_ZOOM_VIEW_UI_SIZE 350 // Size on screen.
// Gui stuff and shit.
typedef struct GameScreen {
@@ -37,6 +37,7 @@ void initGameScreen(Game * game, GameScreen * gameScreen);
void freeGameScreen(GameScreen * gameScreen);
void updateGameScreen(Game * game);
+void resizeGameScreen(Game * game, GameScreen * gameScreen);
void openGameScreen(Game * game);
diff --git a/src/levels/level1.c b/src/levels/level1.c
index 190d606..7ccfe0a 100644
--- a/src/levels/level1.c
+++ b/src/levels/level1.c
@@ -6,7 +6,7 @@
void initLevel1(Game * game, Levels * levels) {
WorldEntry entries[2] = {
(WorldEntry){ENTITY_ANTIFA, (Vector3){0.0, 0.0, 0.0}, QuaternionIdentity()},
- (WorldEntry){ENTITY_SOLDATO, (Vector3){0.0, 10.0, 50.0}, QuaternionIdentity()}
+ (WorldEntry){ENTITY_CAPORALE, (Vector3){0.0, 10.0, 50.0}, QuaternionIdentity()}
};
addEntriesToWorld(
diff --git a/src/settings.c b/src/settings.c
index a383e9f..8f35206 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -14,8 +14,8 @@ void initSettings(Settings * settings) {
.joystickSensitivity = 0.5,
.fps = 60.0,
.drawFps = true,
- .renderWidth = 480,
- .renderHeight = 270,
+ .renderWidth = 640,
+ .renderHeight = 360,
.useWorldRenderTexture = true
};
}