Removed photo gallery + added cute little grass rendering for the rabbit and a nice gradient backgroundHEADmaster

1 files changed, 35 insertions, 29 deletions

diff --git a/themes/src/spring/spring_theme.hpp b/themes/src/spring/spring_theme.hpp
index 6079958..4ee5684 100644
--- a/themes/src/spring/spring_theme.hpp
+++ b/themes/src/spring/spring_theme.hpp
@@ -2,44 +2,50 @@
 #define SPRING_THEME_HPP
 
 #include "../mathlib.h"
-#include "../types.h"
+#include "../renderer_2d.h"
 #include "../renderer_3d.h"
 #include "../theme.h"
+#include "../types.h"
+#include "grass_renderer.hpp"
 
+class RectangularGradient;
 
 enum class SpringThemeState {
-	Loading = 0,
-	LoadedShader,
-	LoadedBunny,
-	PreHop,
-	Hopping,
-	Idle
+  Loading = 0,
+  LoadedShader,
+  LoadedBunny,
+  PreHop,
+  Hopping,
+  Idle
 };
 
 class SpringTheme : public Theme {
 public:
-    SpringTheme(WebglContext*);
-    ~SpringTheme();
-	Renderer3d renderer;
-	SpringThemeState state;
-	f32 bunnySpeed = 5.f;
-	Vector3 bunnyPosition = Vector3(0, 0, 0);
-	Vector3 bunnyTarget = Vector3(0, 0, 0);
-	Vector3 hopIncrement = Vector3(0, 0, 0);
-
-    f32 numHops = 0;
-	f32 hopCount = 0;
-	f32 bunnyHopAnimationTimer = 0.f;
-	f32 stateTimer = 0.f;
-	f32 bunnyRotation = 0.f;
-	f32 targetRotation = 0.f;
-
-	Mesh3d bunnyMesh;
-
-	void load(WebglContext*);
-	void update(f32 dtSeconds);
-	void render();
-	void unload();
+  SpringTheme(WebglContext *);
+  ~SpringTheme();
+  Renderer3d renderer;
+  SpringThemeState state;
+  f32 bunnySpeed = 5.f;
+  Vector3 bunnyPosition = Vector3(0, 0, 0);
+  Vector3 bunnyTarget = Vector3(0, 0, 0);
+  Vector3 hopIncrement = Vector3(0, 0, 0);
+
+  f32 numHops = 0;
+  f32 hopCount = 0;
+  f32 bunnyHopAnimationTimer = 0.f;
+  f32 stateTimer = 0.f;
+  f32 bunnyRotation = 0.f;
+  f32 targetRotation = 0.f;
+
+  Mesh3d bunnyMesh;
+  GrassRenderer grassRenderer;
+  Renderer2d renderer2d;
+  RectangularGradient *background;
+
+  void load(WebglContext *);
+  void update(f32 dtSeconds);
+  void render();
+  void unload();
 };
 
 #endif