fix missing link to starfield implementation files

interface/CMakeLists.txt

@@ -38,14 +38,11 @@ configure_file(InterfaceConfig.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceConf
 
 # grab the implementation and header files from src dirs
 file(GLOB INTERFACE_SRCS src/*.cpp src/*.h)
-foreach(SUBDIR avatar devices renderer ui)
+foreach(SUBDIR avatar devices renderer ui starfield)
-  file(GLOB SUBDIR_SRCS src/${SUBDIR}/*.cpp src/${SUBDIR}/*.h)
+  file(GLOB_RECURSE SUBDIR_SRCS src/${SUBDIR}/*.cpp src/${SUBDIR}/*.h)
   set(INTERFACE_SRCS ${INTERFACE_SRCS} ${SUBDIR_SRCS})
 endforeach(SUBDIR)
 
-# project subdirectories
-add_subdirectory(src/starfield)
-
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Gui REQUIRED)
 find_package(Qt5Multimedia REQUIRED)

interface/src/Stars.cpp

@@ -9,9 +9,7 @@
 #include "InterfaceConfig.h"
 #include "Stars.h" 
 
-#define __interface__Starfield_impl__
 #include "starfield/Controller.h"
-#undef __interface__Starfield_impl__
 
 Stars::Stars() : 
     _controller(0l), _starsLoaded(false) {

interface/src/Stars.h

@@ -13,28 +13,20 @@
 
 namespace starfield { class Controller; }
 
-// 
 // Starfield rendering component. 
-// 
 class Stars  {
-    public:
+public:
     Stars();
     ~Stars();
 
-        //
+    // Generate stars from random number
-        // Generate stars from random number seed
-        //
     // The numStars parameter sets the number of stars to generate.
-        //
     bool generate(unsigned numStars, unsigned seed);
 
-        // 
     // Renders the starfield from a local viewer's perspective.
     // The parameters specifiy the field of view.
-        // 
     void render(float fovY, float aspect, float nearZ, float alpha);
 
-        // 
     // Sets the resolution for FOV culling.
     //
     // The parameter determines the number of tiles in azimuthal 
@@ -42,21 +34,15 @@ class Stars  {
     //
     // GPU resources are updated upon change in which case 'true'
     // is returned.
-        // 
     bool setResolution(unsigned k);
 
-    
-        //
     // Returns true when stars have been loaded
-        //
     bool isStarsLoaded() const { return _starsLoaded; };
-    private:
+private:
     // don't copy/assign
     Stars(Stars const&); // = delete;
     Stars& operator=(Stars const&); // delete;
 
-        // variables
-
     starfield::Controller* _controller;
     
     bool _starsLoaded;

interface/src/starfield/CMakeLists.txt

@@ -1,9 +0,0 @@
-
-project(starfield)
-
-# Only headers (that are facaded by the Stars.cpp file) here -
-# hence declared as custom target.
-
-file(GLOB_RECURSE STARFIELD_SRCS *.cpp *.h)
-add_custom_target("starfield" SOURCES ${STARFIELD_SRCS})
-

interface/src/starfield/Controller.h

@@ -18,25 +18,16 @@
 #include "starfield/renderer/VertexOrder.h"
 
 namespace starfield {
-
     class Controller {
     public:
-
         Controller() : _tileResolution(20), _renderer(0l) { }
         
-        ~Controller() {
+        ~Controller() { delete _renderer; }
-            delete _renderer;
-        }
         
         bool computeStars(unsigned numStars, unsigned seed);
-
         bool setResolution(unsigned tileResolution);
-
-
         void render(float perspective, float angle, mat4 const& orientation, float alpha);
-
     private:
-
         void retile(unsigned numStars, unsigned tileResolution);
 
         void recreateRenderer(unsigned numStars, unsigned tileResolution);
@@ -45,7 +36,6 @@ namespace starfield {
         unsigned _tileResolution;
         unsigned _numStars;
         Renderer* _renderer;
-        
     };
 }
 #endif