From 4d9adf2e7fcd978cfdb4b5dc88154cec99ef10d0 Mon Sep 17 00:00:00 2001
From: Cat Flynn <me@ktyl.dev>
Date: Sun, 18 Aug 2024 13:22:04 +0100
Subject: [PATCH] refactor: move sphere to visualizer

---
 src/main.cpp              | 4 +---
 src/orbitervisualizer.cpp | 4 ++--
 src/orbitervisualizer.hpp | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 620fa05..3daaa1a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -95,7 +95,6 @@ int main()
     // set up scene
     Icosphere planet(0.2, 3, litProgram);
 
-    //Orbiter orbiter(orbiterSphere, orbit, unlitProgram);
     Orbiter orbiter;
     Orbit& orbit = orbiter.getOrbit();
     orbit.setSemiMajorAxis(.75);
@@ -104,8 +103,7 @@ int main()
     orbit.setArgumentOfPeriapsis(2.0);
     orbit.setLongitudeOfAscendingNode(0.1);
 
-    Icosphere orbiterSphere(0.07, 2, litProgram);
-    OrbiterVisualizer orbiterVisualizer(orbiter, orbiterSphere, unlitProgram);
+    OrbiterVisualizer orbiterVisualizer(orbiter, litProgram, unlitProgram);
     OrbitVisualizer orbitVisualizer(orbit, unlitProgram);
 
     // register input
diff --git a/src/orbitervisualizer.cpp b/src/orbitervisualizer.cpp
index e4f2144..025a99d 100644
--- a/src/orbitervisualizer.cpp
+++ b/src/orbitervisualizer.cpp
@@ -1,7 +1,7 @@
 #include "orbitervisualizer.hpp"
 
-OrbiterVisualizer::OrbiterVisualizer(Orbiter& orbiter, Icosphere& sphere, GLuint shaderProgram)
-    : _orbiter(orbiter), _sphere(sphere), _widget(shaderProgram)
+OrbiterVisualizer::OrbiterVisualizer(Orbiter& orbiter, GLuint sphereShaderProgram, GLuint widgetShaderProgram)
+    : _orbiter(orbiter), _sphere({0.07, 2, sphereShaderProgram}), _widget(widgetShaderProgram)
 {
 }
 
diff --git a/src/orbitervisualizer.hpp b/src/orbitervisualizer.hpp
index 63bc967..32d6a46 100644
--- a/src/orbitervisualizer.hpp
+++ b/src/orbitervisualizer.hpp
@@ -7,7 +7,7 @@
 class OrbiterVisualizer
 {
     public:
-        OrbiterVisualizer(Orbiter& orbiter, Icosphere& sphere, GLuint shaderProgram);
+        OrbiterVisualizer(Orbiter& orbiter, GLuint sphereShaderProgram, GLuint widgetShaderProgram);
         ~OrbiterVisualizer() = default;
 
         void render(float time);
@@ -16,6 +16,6 @@ class OrbiterVisualizer
         void updateModelMatrix();
 
         Orbiter& _orbiter;
-        Icosphere& _sphere;
+        Icosphere _sphere;
         Widget _widget;
 };