16:9 widescreen, and fullscreen is less weird now

author: Star Rauchenberger <fefferburbia@gmail.com> 2022-03-12 22:51:27 -0500
committer: Star Rauchenberger <fefferburbia@gmail.com> 2022-03-12 22:51:27 -0500
commit: 7a678440fab1b68000e384bb9b37b92f71a108b2 (patch)
tree: c0692b9190822b7893b2d756c0e4b60575198739
parent: 37aeea92755564f3507cba7f4b79e2556e1ff772 (diff)
download: ether-7a678440fab1b68000e384bb9b37b92f71a108b2.tar.gz
ether-7a678440fab1b68000e384bb9b37b92f71a108b2.tar.bz2
ether-7a678440fab1b68000e384bb9b37b92f71a108b2.zip
3 files changed, 7 insertions, 7 deletions
diff --git a/src/game.h b/src/game.h
index c91a001..9feb774 100644
--- a/src/game.h
+++ b/src/game.h

@@ -11,13 +11,13 @@
 #include "animation.h"
 #include "interpolation.h"
-const int GAME_WIDTH = 640*2;
+const int GAME_WIDTH = 1280;//640*2;
-const int GAME_HEIGHT = 480*2;
+const int GAME_HEIGHT = 720;//480*2;
 const int TILE_WIDTH = 8*2;
 const int TILE_HEIGHT = TILE_WIDTH;
-const int INIT_ZOOM = 10;
+const int INIT_ZOOM = 5;
-const int ZOOM_X_FACTOR = 8;
+const int ZOOM_X_FACTOR = 16;
-const int ZOOM_Y_FACTOR = 6;
+const int ZOOM_Y_FACTOR = 9;
 const int RADIUS = 8;
 constexpr int TilesetIndex(int x, int y) {
diff --git a/src/main.cpp b/src/main.cpp
index 27c78ec..47c6966 100644
--- a/src/main.cpp
+++ b/src/main.cpp

@@ -907,7 +907,7 @@ int main(int, char**)
        tick(game, true);
        // TODO: better zoom algorithm
-        setZoom(game, game.litSpots / 1500 * 2 + INIT_ZOOM);
+        setZoom(game, game.litSpots / 1500 + INIT_ZOOM);
      }
      if (game.dirtyRender) {
diff --git a/src/renderer.cpp b/src/renderer.cpp
index 251ff96..1858520 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp

@@ -12,7 +12,7 @@ Renderer::Renderer()
      GAME_HEIGHT,
      SDL_WINDOW_SHOWN));
-  SDL_SetWindowFullscreen(win_.get(), SDL_WINDOW_FULLSCREEN);
+  SDL_SetWindowFullscreen(win_.get(), SDL_WINDOW_FULLSCREEN_DESKTOP);
  if (!win_)
  {
author	Star Rauchenberger <fefferburbia@gmail.com>	2022-03-12 22:51:27 -0500
committer	Star Rauchenberger <fefferburbia@gmail.com>	2022-03-12 22:51:27 -0500
commit	7a678440fab1b68000e384bb9b37b92f71a108b2 (patch)
tree	c0692b9190822b7893b2d756c0e4b60575198739
parent	37aeea92755564f3507cba7f4b79e2556e1ff772 (diff)
download	ether-7a678440fab1b68000e384bb9b37b92f71a108b2.tar.gz ether-7a678440fab1b68000e384bb9b37b92f71a108b2.tar.bz2 ether-7a678440fab1b68000e384bb9b37b92f71a108b2.zip

diff --git a/src/game.h b/src/game.h index c91a001..9feb774 100644 --- a/src/game.h +++ b/src/game.h
@@ -11,13 +11,13 @@
11	#include "animation.h"	11	#include "animation.h"
12	#include "interpolation.h"	12	#include "interpolation.h"
13		13
14	const int GAME_WIDTH = 640*2;	14	const int GAME_WIDTH = 1280;//640*2;
15	const int GAME_HEIGHT = 480*2;	15	const int GAME_HEIGHT = 720;//480*2;
16	const int TILE_WIDTH = 8*2;	16	const int TILE_WIDTH = 8*2;
17	const int TILE_HEIGHT = TILE_WIDTH;	17	const int TILE_HEIGHT = TILE_WIDTH;
18	const int INIT_ZOOM = 10;	18	const int INIT_ZOOM = 5;
19	const int ZOOM_X_FACTOR = 8;	19	const int ZOOM_X_FACTOR = 16;
20	const int ZOOM_Y_FACTOR = 6;	20	const int ZOOM_Y_FACTOR = 9;
21	const int RADIUS = 8;	21	const int RADIUS = 8;
22		22
23	constexpr int TilesetIndex(int x, int y) {	23	constexpr int TilesetIndex(int x, int y) {


diff --git a/src/main.cpp b/src/main.cpp index 27c78ec..47c6966 100644 --- a/src/main.cpp +++ b/src/main.cpp
@@ -907,7 +907,7 @@ int main(int, char**)
907	tick(game, true);	907	tick(game, true);
908		908
909	// TODO: better zoom algorithm	909	// TODO: better zoom algorithm
910	setZoom(game, game.litSpots / 1500 * 2 + INIT_ZOOM);	910	setZoom(game, game.litSpots / 1500 + INIT_ZOOM);
911	}	911	}
912		912
913	if (game.dirtyRender) {	913	if (game.dirtyRender) {


diff --git a/src/renderer.cpp b/src/renderer.cpp index 251ff96..1858520 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp
@@ -12,7 +12,7 @@ Renderer::Renderer()
12	GAME_HEIGHT,	12	GAME_HEIGHT,
13	SDL_WINDOW_SHOWN));	13	SDL_WINDOW_SHOWN));
14		14
15	SDL_SetWindowFullscreen(win_.get(), SDL_WINDOW_FULLSCREEN);	15	SDL_SetWindowFullscreen(win_.get(), SDL_WINDOW_FULLSCREEN_DESKTOP);
16		16
17	if (!win_)	17	if (!win_)
18	{	18	{