Watcher.cpp and friends - renamings, no new functionality

Notes to self.txt

-Use shader introspection find which shaders need to attach to the uniform block points, resulting in sets of shaders where binding point would be the key.
-this way we can loop through them
\ No newline at end of file

include/overkill/Watcher.hpp

@@ -29,8 +29,14 @@ private:
     static std::vector<FileEvent> events;
 
 public:
+    static constexpr char EventDiscovered[]  = "discovered";
+    static constexpr char EventModified[]    = "modified";
+    static constexpr char EventDeleted[]     = "deleted";
+    static constexpr char EventMoved[]       = "moved";
+    static constexpr char EventCreated[]     = "created";
+
     static auto popEvents(std::string eventType, std::string collection)->std::vector<FileEvent>;
-    static void discoverFiles();
+    static void pollEvents();
 };
 
 }

src/MaterialSystem.cpp

@@ -29,7 +29,7 @@ auto MaterialSystem::getById(C::ID materialID) -> const Material&
 void MaterialSystem::reload() 
 {
     MaterialSystem::m_materials.clear();
-    Watcher::discoverFiles();
+    Watcher::pollEvents();
     MaterialSystem::load();
 
     for(auto onUpdate : MaterialSystem::m_updateCallbacks)

src/ModelSystem.cpp

@@ -76,7 +76,7 @@ void ModelSystem::reload()
     ShaderSystem::unbindAll();
 
     // Finally load new data
-    Watcher::discoverFiles();
+    Watcher::pollEvents();
     ModelSystem::load();
 }
 

src/ShaderSystem.cpp

@@ -228,7 +228,7 @@ void ShaderSystem::reload()
 
 
     // Load from file again
-    Watcher::discoverFiles();
+    Watcher::pollEvents();
     ShaderSystem::load();
     for(auto onUpdate : ShaderSystem::m_updateCallbacks)
     {

src/Watcher.cpp

@@ -36,7 +36,8 @@ auto Watcher::popEvents(std::string eventType, std::string collection)->std::vec
     return result;
 }
 
-void Watcher::discoverFiles()
+
+void Watcher::pollEvents()
 {
     using namespace std::chrono_literals;
 
@@ -45,13 +46,15 @@ void Watcher::discoverFiles()
 
     FILE* pipe = popen(PYTHON_COMMAND, "r");
     if (!pipe) {
-        printf("FAILED OPENING the pipe\n");
+        printf("FAILED OPENING python pipe\n");
         return;
     }
+    printf("OPENING python pipe %s\n", PYTHON_COMMAND);
+
 
     char* msg;
     while (msg = fgets(data, DATA_SIZE, pipe)) {
-        printf("msg %s", msg);
+        printf("event %s", msg);
 
 
         std::stringstream ss;
@@ -63,10 +66,10 @@ void Watcher::discoverFiles()
     }
 
     if (int notclosed = pclose(pipe); notclosed) {
-        printf("FAILED CLOSING the pipe\n");
+        printf("FAILED CLOSING python pipe\n");
         return;
     }
-    printf("CLOSING the pipe\n");
+    printf("CLOSING python pipe\n");
 }
 
 }

src/main.cpp

@@ -46,7 +46,7 @@ int main()
 
     Init::GLEW();
     Init::OpenGL(C::ClearColor); //(0.05f, 0.06f, 0.075f, 1.0f) for sexy dark blue-grey
-    Watcher::discoverFiles();
+    Watcher::pollEvents();
 
     // Load resource subsystems
     TextureSystem::load();

tool/test-discover.cpp

@@ -32,7 +32,7 @@ private:
 
 public:
     static auto popEvents(std::string eventType, std::string collection)->std::vector<FileEvent>;
-    static void discoverFiles();
+    static void pollEvents();
 };
 
 
@@ -58,7 +58,7 @@ auto Watcher::popEvents(std::string eventType, std::string collection)->std::vec
     return result;
 }
 
-void Watcher::discoverFiles()
+void Watcher::pollEvents()
 {
     using namespace std::chrono_literals;
 
@@ -92,7 +92,7 @@ void Watcher::discoverFiles()
 }
 int main()
 {
-    Watcher::discoverFiles();
+    Watcher::pollEvents();
     auto tevents = Watcher::popEvents("discovered", "textures");
     auto mevents = Watcher::popEvents("discovered", "shaders");
     auto matevents = Watcher::popEvents("discovered", "materials");