render preset buttons in render options interface, also shift + 1 life view shortcut

modify it if you don't like how it looks, but it turned out better than I expected

4 files changed, 7 insertions, 62 deletions

diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 4aceec7..19933cb 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -749,9 +749,10 @@ void GameController::ToggleAHeat()
 }
 
 
-void GameController::LoadRenderPreset(RenderPreset preset)
+void GameController::LoadRenderPreset(int presetNum)
 {
 	Renderer * renderer = gameModel->GetRenderer();
+	RenderPreset preset = renderer->renderModePresets[presetNum];
 	gameModel->SetInfoTip(preset.Name);
 	renderer->SetRenderMode(preset.RenderModes);
 	renderer->SetDisplayMode(preset.DisplayModes);
diff --git a/src/game/GameController.h b/src/game/GameController.h
index 07f37af..dc95f8e 100644
--- a/src/game/GameController.h
+++ b/src/game/GameController.h
@@ -76,7 +76,7 @@ public:
 
 	void AdjustGridSize(int direction);
 	void InvertAirSim();
-	void LoadRenderPreset(RenderPreset preset);
+	void LoadRenderPreset(int presetNum);
 	void SetZoomEnabled(bool zoomEnable);
 	void SetZoomPosition(ui::Point position);
 	void AdjustBrushSize(int direction, bool logarithmic = false, bool xAxis = false, bool yAxis = false);
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index d162615..af9eaaa 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -417,65 +417,10 @@ GameView::GameView():
 	};
 	colourPicker = new ui::Button(ui::Point((XRES/2)-8, YRES+1), ui::Point(16, 16), "", "Pick Colour");
 	colourPicker->SetActionCallback(new ColourPickerAction(this));
-
-	//Render mode presets. Possibly load from config in future?
-	renderModePresets = new RenderPreset[10];
-
-	renderModePresets[0].Name = "Alternative Velocity Display";
-	renderModePresets[0].RenderModes.push_back(RENDER_EFFE);
-	renderModePresets[0].RenderModes.push_back(RENDER_BASC);
-	renderModePresets[0].DisplayModes.push_back(DISPLAY_AIRC);
-
-	renderModePresets[1].Name = "Velocity Display";
-	renderModePresets[1].RenderModes.push_back(RENDER_EFFE);
-	renderModePresets[1].RenderModes.push_back(RENDER_BASC);
-	renderModePresets[1].DisplayModes.push_back(DISPLAY_AIRV);
-
-	renderModePresets[2].Name = "Pressure Display";
-	renderModePresets[2].RenderModes.push_back(RENDER_EFFE);
-	renderModePresets[2].RenderModes.push_back(RENDER_BASC);
-	renderModePresets[2].DisplayModes.push_back(DISPLAY_AIRP);
-
-	renderModePresets[3].Name = "Persistent Display";
-	renderModePresets[3].RenderModes.push_back(RENDER_EFFE);
-	renderModePresets[3].RenderModes.push_back(RENDER_BASC);
-	renderModePresets[3].DisplayModes.push_back(DISPLAY_PERS);
-
-	renderModePresets[4].Name = "Fire Display";
-	renderModePresets[4].RenderModes.push_back(RENDER_FIRE);
-	renderModePresets[4].RenderModes.push_back(RENDER_EFFE);
-	renderModePresets[4].RenderModes.push_back(RENDER_BASC);
-
-	renderModePresets[5].Name = "Blob Display";
-	renderModePresets[5].RenderModes.push_back(RENDER_FIRE);
-	renderModePresets[5].RenderModes.push_back(RENDER_EFFE);
-	renderModePresets[5].RenderModes.push_back(RENDER_BLOB);
-
-	renderModePresets[6].Name = "Heat Display";
-	renderModePresets[6].RenderModes.push_back(RENDER_BASC);
-	renderModePresets[6].DisplayModes.push_back(DISPLAY_AIRH);
-	renderModePresets[6].ColourMode = COLOUR_HEAT;
-
-	renderModePresets[7].Name = "Fancy Display";
-	renderModePresets[7].RenderModes.push_back(RENDER_FIRE);
-	renderModePresets[7].RenderModes.push_back(RENDER_GLOW);
-	renderModePresets[7].RenderModes.push_back(RENDER_BLUR);
-	renderModePresets[7].RenderModes.push_back(RENDER_EFFE);
-	renderModePresets[7].RenderModes.push_back(RENDER_BASC);
-	renderModePresets[7].DisplayModes.push_back(DISPLAY_WARP);
-
-	renderModePresets[8].Name = "Nothing Display";
-	renderModePresets[8].RenderModes.push_back(RENDER_BASC);
-
-	renderModePresets[9].Name = "Heat Gradient Display";
-	renderModePresets[9].RenderModes.push_back(RENDER_BASC);
-	renderModePresets[9].ColourMode = COLOUR_GRAD;
 }
 
 GameView::~GameView()
 {
-	delete[] renderModePresets;
-
 	if(!colourPicker->GetParentWindow())
 		delete colourPicker;
 
@@ -1405,9 +1350,11 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 		break;
 	}
 
-	if(key >= '0' && key <= '9')
+	if (shift && showDebug && key == '1')
+		c->LoadRenderPreset(10);
+	else if(key >= '0' && key <= '9')
 	{
-		c->LoadRenderPreset(renderModePresets[key-'0']);
+		c->LoadRenderPreset(key-'0');
 	}
 }
 
diff --git a/src/game/GameView.h b/src/game/GameView.h
index 7e5125b..7fb5794 100644
--- a/src/game/GameView.h
+++ b/src/game/GameView.h
@@ -13,7 +13,6 @@
 #include "interface/Slider.h"
 #include "interface/Textbox.h"
 #include "ToolButton.h"
-#include "RenderPreset.h"
 #include "Brush.h"
 #include "simulation/Sample.h"
 
@@ -101,8 +100,6 @@ private:
 
 	ui::Point mousePosition;
 
-	RenderPreset * renderModePresets;
-
 	Thumbnail * placeSaveThumb;
 
 	SimulationSample sample;