Switch settings over to constants

Add input profiles
bdamer · Sep 28, 2024 · 110725f · 110725f
1 parent 1b50238
commit 110725f
Show file tree

Hide file tree

Showing 69 changed files with 259 additions and 197 deletions.
diff --git a/examples/assets/collision.ini b/examples/assets/collision.ini
@@ -11,8 +11,8 @@ window.height=720
 window.fullscreen=false
 window.vsync=true
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.mouse.lock=false
 input.joystick.support=true
diff --git a/examples/assets/flocking.ini b/examples/assets/flocking.ini
@@ -11,7 +11,7 @@ window.height=720
 window.fullscreen=false
 window.vsync=false
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.joystick.support=true
diff --git a/examples/assets/framebuffer.ini b/examples/assets/framebuffer.ini
@@ -10,9 +10,9 @@ window.width=1280
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=0.1
-camera.farclip=1000
-camera.fov=45
+video.camera.nearclip=0.1
+video.camera.farclip=1000
+video.camera.fov=45
 ; Input
 input.mouse.lock=false
 input.mouse.cursor=true

diff --git a/examples/assets/fullscreenfx.ini b/examples/assets/fullscreenfx.ini
@@ -10,8 +10,8 @@ window.width=960
 window.height=540
 window.fullscreen=false
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.mouse.lock=false
 input.joystick.support=true
diff --git a/examples/assets/grid.ini b/examples/assets/grid.ini
@@ -10,9 +10,9 @@ window.width=1080
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=0.1
-camera.farclip=1000
-camera.fov=45
+video.camera.nearclip=0.1
+video.camera.farclip=1000
+video.camera.fov=45
 ; Input
 input.mouse.lock=true
 input.joystick.support=true

diff --git a/examples/assets/heatmap.ini b/examples/assets/heatmap.ini
@@ -10,9 +10,9 @@ window.width=1280
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=0.1
-camera.farclip=4000
-camera.fov=45
+video.camera.nearclip=0.1
+video.camera.farclip=4000
+video.camera.fov=45
 ; Input
 input.mouse.lock=false
 input.joystick.support=true

diff --git a/examples/assets/hello.ini b/examples/assets/hello.ini
@@ -10,7 +10,7 @@ window.width=640
 window.height=480
 window.fullscreen=false
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.joystick.support=true
diff --git a/examples/assets/input.ini b/examples/assets/input.ini
@@ -10,8 +10,8 @@ window.width=1280
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.longpress=1000
 input.mouse.lock=false

diff --git a/examples/assets/layers.ini b/examples/assets/layers.ini
@@ -10,7 +10,7 @@ window.width=1280
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.joystick.support=true
diff --git a/examples/assets/lighting.ini b/examples/assets/lighting.ini
@@ -10,9 +10,9 @@ window.width=1280
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=0.1
-camera.farclip=1000
-camera.fov=45
+video.camera.nearclip=0.1
+video.camera.farclip=1000
+video.camera.fov=45
 ; Input
 input.mouse.lock=false
 input.joystick.support=true

diff --git a/examples/assets/lighting2d.ini b/examples/assets/lighting2d.ini
@@ -10,7 +10,7 @@ window.width=1280
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.joystick.support=true
diff --git a/examples/assets/mapgen.ini b/examples/assets/mapgen.ini
@@ -10,9 +10,9 @@ window.width=1280
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=0.1
-camera.farclip=1000
-camera.fov=45
+video.camera.nearclip=0.1
+video.camera.farclip=1000
+video.camera.fov=45
 ; Input
 input.mouse.lock=false
 input.joystick.support=true

diff --git a/examples/assets/modelviewer.ini b/examples/assets/modelviewer.ini
@@ -11,9 +11,9 @@ window.width=1080
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=0.1
-camera.farclip=1000
-camera.fov=45
+video.camera.nearclip=0.1
+video.camera.farclip=1000
+video.camera.fov=45
 ; Input
 input.mouse.lock=false
 input.joystick.support=true

diff --git a/examples/assets/octree.ini b/examples/assets/octree.ini
@@ -11,8 +11,8 @@ window.height=720
 window.fullscreen=false
 window.resizable=true
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.mouse.lock=true
 input.joystick.support=true

diff --git a/examples/assets/particles.ini b/examples/assets/particles.ini
@@ -10,8 +10,8 @@ window.width=1440
 window.height=810
 window.fullscreen=false
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.mouse.lock=false
 input.joystick.support=true
diff --git a/examples/assets/room.ini b/examples/assets/room.ini
@@ -10,9 +10,9 @@ window.width=800
 window.height=600
 window.fullscreen=false
 ; Camera
-camera.nearclip=0.1
-camera.farclip=1000
-camera.fov=45
+video.camera.nearclip=0.1
+video.camera.farclip=1000
+video.camera.fov=45
 ; Input
 input.joystick.support=true
 ; Renderer

diff --git a/examples/assets/scenes.ini b/examples/assets/scenes.ini
@@ -12,9 +12,9 @@ window.height=768
 window.fullscreen=false
 window.fullscreen_desktop=false
 ; Camera
-camera.nearclip=0.1
-camera.farclip=1000
-camera.fov=45
+video.camera.nearclip=0.1
+video.camera.farclip=1000
+video.camera.fov=45
 ; Input
 input.mouse.lock=false
 input.joystick.support=true

diff --git a/examples/assets/scrolling.ini b/examples/assets/scrolling.ini
@@ -12,8 +12,8 @@ window.fullscreen=false
 ; Video
 video.forcesync=true
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.joystick.support=true
 ; Game

diff --git a/examples/assets/skydome.ini b/examples/assets/skydome.ini
@@ -10,9 +10,9 @@ window.width=1080
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=0.1
-camera.farclip=250
-camera.fov=45
+video.camera.nearclip=0.1
+video.camera.farclip=250
+video.camera.fov=45
 ; Input
 input.mouse.lock=true
 input.joystick.support=true

diff --git a/examples/assets/sprites.ini b/examples/assets/sprites.ini
@@ -15,7 +15,7 @@ audio.channels=16
 audio.music.volume=0.5
 audio.sample.volume=1.0
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.joystick.support=true
diff --git a/examples/assets/surface.ini b/examples/assets/surface.ini
@@ -10,8 +10,8 @@ window.width=768
 window.height=768
 window.fullscreen=false
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.mouse.lock=false
 input.joystick.support=true
diff --git a/examples/assets/terrain.ini b/examples/assets/terrain.ini
@@ -10,9 +10,9 @@ window.width=1280
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=0.1
-camera.farclip=4000
-camera.fov=45
+video.camera.nearclip=0.1
+video.camera.farclip=4000
+video.camera.fov=45
 ; Input
 input.mouse.lock=false
 input.joystick.support=true

diff --git a/examples/assets/text.ini b/examples/assets/text.ini
@@ -10,7 +10,7 @@ window.width=960
 window.height=540
 window.fullscreen=false
 ; Camera
-camera.nearclip=0
-camera.farclip=100
+video.camera.nearclip=0
+video.camera.farclip=100
 ; Input
 input.joystick.support=true
diff --git a/examples/assets/waves.ini b/examples/assets/waves.ini
@@ -11,9 +11,9 @@ window.width=1280
 window.height=720
 window.fullscreen=false
 ; Camera
-camera.nearclip=1
-camera.farclip=200
-camera.fov=45
+video.camera.nearclip=1
+video.camera.farclip=200
+video.camera.fov=45
 ; Input
 input.mouse.lock=false
 input.joystick.support=true

diff --git a/examples/collision/collisionapp.cpp b/examples/collision/collisionapp.cpp
@@ -15,7 +15,7 @@ namespace dukat
 		auto settings = game->get_settings();
 		// Set up default camera centered around origin
 		auto camera = std::make_unique<Camera2>(game);
-		camera->set_clip(settings.get_float("camera.nearclip"), settings.get_float("camera.farclip"));
+		camera->set_clip(settings.get_float(settings::video_camera_nearclip), settings.get_float(settings::video_camera_farclip));
 		camera->set_resize_handler(fixed_height_camera(window_height));
 		camera->refresh();
 		game->get_renderer()->set_camera(std::move(camera));

diff --git a/examples/flocking/flockingapp.cpp b/examples/flocking/flockingapp.cpp
@@ -13,7 +13,7 @@ namespace dukat
 		auto settings = game->get_settings();
 		// Set up default camera centered around origin
 		auto camera = std::make_unique<Camera2>(game);
-		camera->set_clip(settings.get_float("camera.nearclip"), settings.get_float("camera.farclip"));
+		camera->set_clip(settings.get_float(settings::video_camera_nearclip), settings.get_float(settings::video_camera_farclip));
 		camera->transform.position = Vector2{ 0.5f * window_width, 0.5f * window_height };
 		camera->refresh();
 		game->get_renderer()->set_camera(std::move(camera));

diff --git a/examples/framebuffer/causticsscene.cpp b/examples/framebuffer/causticsscene.cpp
@@ -43,8 +43,8 @@ namespace dukat
 		auto settings = game->get_settings();
 		// Top-down camera
 		auto camera = std::make_unique<FixedCamera3>(game, Vector3{ 0.0f, 2.5f, 0.0f }, Vector3{ 0.0f, 0.0f, 0.0f }, Vector3::unit_z);
-		camera->set_vertical_fov(settings.get_float("camera.fov"));
-		camera->set_clip(settings.get_float("camera.nearclip"), settings.get_float("camera.farclip"));
+		camera->set_vertical_fov(settings.get_float(settings::video_camera_fov));
+		camera->set_clip(settings.get_float(settings::video_camera_nearclip), settings.get_float(settings::video_camera_farclip));
 		camera->refresh();
 		game->get_renderer()->set_camera(std::move(camera));
 

diff --git a/examples/framebuffer/fractalscene.cpp b/examples/framebuffer/fractalscene.cpp
@@ -44,8 +44,8 @@ namespace dukat
 		auto settings = game->get_settings();
 		// Top-down camera
 		auto camera = std::make_unique<FixedCamera3>(game, Vector3{ 0.0f, 2.5f, 0.0f }, Vector3{ 0.0f, 0.0f, 0.0f }, Vector3::unit_z);
-		camera->set_vertical_fov(settings.get_float("camera.fov"));
-		camera->set_clip(settings.get_float("camera.nearclip"), settings.get_float("camera.farclip"));
+		camera->set_vertical_fov(settings.get_float(settings::video_camera_fov));
+		camera->set_clip(settings.get_float(settings::video_camera_nearclip), settings.get_float(settings::video_camera_farclip));
 		camera->refresh();
 		game->get_renderer()->set_camera(std::move(camera));
 

diff --git a/examples/framebuffer/ripplepondscene.cpp b/examples/framebuffer/ripplepondscene.cpp
@@ -76,8 +76,8 @@ namespace dukat
 		auto settings = game->get_settings();
 		// Top-down camera
 		auto camera = std::make_unique<FixedCamera3>(game, Vector3{ 0.0f, 2.5f, 0.0f }, Vector3{ 0.0f, 0.0f, 0.0f }, Vector3::unit_z);
-		camera->set_vertical_fov(settings.get_float("camera.fov"));
-		camera->set_clip(settings.get_float("camera.nearclip"), settings.get_float("camera.farclip"));
+		camera->set_vertical_fov(settings.get_float(settings::video_camera_fov));
+		camera->set_clip(settings.get_float(settings::video_camera_nearclip), settings.get_float(settings::video_camera_farclip));
 		camera->refresh();
 		game->get_renderer()->set_camera(std::move(camera));
 

diff --git a/examples/framebuffer/titlescene.cpp b/examples/framebuffer/titlescene.cpp
@@ -19,8 +19,8 @@ namespace dukat
 	{ 
 		auto settings = game->get_settings();
 		auto camera = std::make_unique<FixedCamera3>(game, Vector3{ 0.0f, 0.0f, 2.5f }, Vector3{ 0.0f, 0.0f, 0.0f }, Vector3::unit_y);
-		camera->set_vertical_fov(settings.get_float("camera.fov"));
-		camera->set_clip(settings.get_float("camera.nearclip"), settings.get_float("camera.farclip"));
+		camera->set_vertical_fov(settings.get_float(settings::video_camera_fov));
+		camera->set_clip(settings.get_float(settings::video_camera_nearclip), settings.get_float(settings::video_camera_farclip));
 		camera->refresh();
 		game->get_renderer()->set_camera(std::move(camera));
 

diff --git a/examples/fullscreenfx/fullscreenfxapp.cpp b/examples/fullscreenfx/fullscreenfxapp.cpp
@@ -12,7 +12,7 @@ namespace dukat
 
 		// Set up default camera centered around origin
 		auto camera = std::make_unique<Camera2>(game);
-		camera->set_clip(settings.get_float("camera.nearclip"), settings.get_float("camera.farclip"));
+		camera->set_clip(settings.get_float(settings::video_camera_nearclip), settings.get_float(settings::video_camera_farclip));
 		camera->set_resize_handler(fixed_width_camera(texture_width));
 		camera->refresh();
 		game->get_renderer()->set_camera(std::move(camera));

diff --git a/examples/grid/gridapp.cpp b/examples/grid/gridapp.cpp
@@ -25,8 +25,8 @@ namespace dukat
 		auto camera = std::make_unique<OrbitCamera3>(game, camera_target, 50.0f, 0.0f, pi_over_four);
 		camera->set_min_distance(5.0f);
 		camera->set_max_distance(100.0f);
-		camera->set_vertical_fov(settings.get_float("camera.fov"));
-		camera->set_clip(settings.get_float("camera.nearclip"), settings.get_float("camera.farclip"));
+		camera->set_vertical_fov(settings.get_float(settings::video_camera_fov));
+		camera->set_clip(settings.get_float(settings::video_camera_nearclip), settings.get_float(settings::video_camera_farclip));
 		camera->refresh();
 		game->get_renderer()->set_camera(std::move(camera));		
 		object_meshes.stage = RenderStage::Scene;

diff --git a/examples/heatmap/heatmapapp.cpp b/examples/heatmap/heatmapapp.cpp
@@ -36,8 +36,8 @@ namespace dukat
 		auto camera = std::make_unique<OrbitCamera3>(game, camera_target, 50.0f, 0.0f, pi_over_four);
 		camera->set_min_distance(5.0f);
 		camera->set_max_distance(100.0f);
-		camera->set_vertical_fov(settings.get_float("camera.fov"));
-		camera->set_clip(settings.get_float("camera.nearclip"), settings.get_float("camera.farclip"));
+		camera->set_vertical_fov(settings.get_float(settings::video_camera_fov));
+		camera->set_clip(settings.get_float(settings::video_camera_nearclip), settings.get_float(settings::video_camera_farclip));
 		camera->refresh();
 		game->get_renderer()->set_camera(std::move(camera));		
 

diff --git a/examples/hello/hellodukat.cpp b/examples/hello/hellodukat.cpp
@@ -13,7 +13,7 @@ namespace dukat
 
 		// Set up default camera centered around origin
 		auto camera = std::make_unique<Camera2>(game);
-		camera->set_clip(settings.get_float("camera.nearclip"), settings.get_float("camera.farclip"));
+		camera->set_clip(settings.get_float(settings::video_camera_nearclip), settings.get_float(settings::video_camera_farclip));
 		camera->set_resize_handler(fixed_camera(camera_width, camera_height));
 		camera->refresh();
 		game->get_renderer()->set_camera(std::move(camera));