Added global resource autoreload settings

ivansafrin · ivansafrin · commit ba879693a668 · 2014-04-26T15:37:34.000-04:00
diff --git a/Core/Contents/Include/PolyResource.h b/Core/Contents/Include/PolyResource.h
@@ -61,6 +61,9 @@ namespace Polycode {
 			static const int RESOURCE_SCREEN_ENTITY_INSTANCE = 8;
 			
 			bool reloadOnFileModify;
+        
+            static bool defaultReloadOnFileModify;
+        
 			time_t resourceFileTime;
 						
 			//@}
diff --git a/Core/Contents/Include/PolyResourceManager.h b/Core/Contents/Include/PolyResourceManager.h
@@ -63,6 +63,8 @@ namespace Polycode {
             int resourceSubscribers;
             bool deleteOnUnsubscribe;
         
+            static bool defaultReloadResourcesOnModify;
+        
         private:
         
             ResourcePool *fallbackPool;
diff --git a/Core/Contents/Source/PolyResource.cpp b/Core/Contents/Source/PolyResource.cpp
@@ -26,9 +26,11 @@
 
 using namespace Polycode;
 
+bool Resource::defaultReloadOnFileModify = false;
+
 Resource::Resource(int type) : EventDispatcher() {
 	this->type = type;
-	reloadOnFileModify = false;
+	reloadOnFileModify = defaultReloadOnFileModify;
 	resourceFileTime = 0;
 }
 
diff --git a/Core/Contents/Source/PolyResourceManager.cpp b/Core/Contents/Source/PolyResourceManager.cpp
@@ -38,12 +38,14 @@
 using std::vector;
 using namespace Polycode;
 
+bool ResourcePool::defaultReloadResourcesOnModify = false;
+
 ResourcePool::ResourcePool(const String &name, ResourcePool *fallbackPool) {
     
     this->name = name;
     this->fallbackPool = fallbackPool;
 	dispatchChangeEvents = false;
-	reloadResourcesOnModify = false;
+	reloadResourcesOnModify = ResourcePool::defaultReloadResourcesOnModify;
 	ticksSinceCheck = 0;
     resourceSubscribers = 0;
     deleteOnUnsubscribe = false;
diff --git a/IDE/Contents/Source/PolycodeFrame.cpp b/IDE/Contents/Source/PolycodeFrame.cpp
@@ -1513,7 +1513,7 @@ void PolycodeFrame::showModal(UIWindow *modalChild) {
 void PolycodeFrame::hideModal() {
 	if(modalChild) {
 		modalRoot->removeChild(modalChild);
-		modalChild->removeEventListener(this, UIEvent::CLOSE_EVENT);	
+		modalChild->removeAllHandlers();
 		modalChild->hideWindow(); 
 		modalChild = NULL;
 	}
diff --git a/IDE/Contents/Source/PolycodeIDEApp.cpp b/IDE/Contents/Source/PolycodeIDEApp.cpp
@@ -43,8 +43,12 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 
     Entity::defaultBlendingMode = Renderer::BLEND_MODE_NONE;
 	
+    ResourcePool::defaultReloadResourcesOnModify = true;
+    Resource::defaultReloadOnFileModify = true;
+    
 	CoreServices::getInstance()->getResourceManager()->getGlobalPool()->reloadResourcesOnModify = true;
 	
+    
 	runNextFrame = false;
 	
 	core->addEventListener(this, Core::EVENT_CORE_RESIZE);
diff --git a/Tools/Dependencies/miniz/miniz.c b/Tools/Dependencies/miniz/miniz.c
diff --git a/Tools/Dependencies/miniz/timer.cpp b/Tools/Dependencies/miniz/timer.cpp
@@ -0,0 +1,152 @@
+// File: timer.cpp - Simple high-precision timer class. Supports Win32, X360, and POSIX/Linux
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+#include <time.h>
+
+#include "timer.h"
+
+#if defined(WIN32)
+#include <windows.h>
+#elif defined(_XBOX)
+#include <xtl.h>
+#endif
+
+unsigned long long timer::g_init_ticks;
+unsigned long long timer::g_freq;
+double timer::g_inv_freq;
+
+#if defined(WIN32) || defined(_XBOX)
+inline void query_counter(timer_ticks *pTicks)
+{
+   QueryPerformanceCounter(reinterpret_cast<LARGE_INTEGER*>(pTicks));
+}
+inline void query_counter_frequency(timer_ticks *pTicks)
+{
+   QueryPerformanceFrequency(reinterpret_cast<LARGE_INTEGER*>(pTicks));
+}
+#elif defined(__GNUC__)
+#include <sys/timex.h>
+inline void query_counter(timer_ticks *pTicks)
+{
+   struct timeval cur_time;
+   gettimeofday(&cur_time, NULL);
+   *pTicks = static_cast<unsigned long long>(cur_time.tv_sec)*1000000ULL + static_cast<unsigned long long>(cur_time.tv_usec);
+}
+inline void query_counter_frequency(timer_ticks *pTicks)
+{
+   *pTicks = 1000000;
+}
+#endif
+
+timer::timer() :
+   m_start_time(0),
+   m_stop_time(0),
+   m_started(false),
+   m_stopped(false)
+{
+   if (!g_inv_freq)
+      init();
+}
+
+timer::timer(timer_ticks start_ticks)
+{
+   if (!g_inv_freq)
+      init();
+
+   m_start_time = start_ticks;
+
+   m_started = true;
+   m_stopped = false;
+}
+
+void timer::start(timer_ticks start_ticks)
+{
+   m_start_time = start_ticks;
+
+   m_started = true;
+   m_stopped = false;
+}
+
+void timer::start()
+{
+   query_counter(&m_start_time);
+
+   m_started = true;
+   m_stopped = false;
+}
+
+void timer::stop()
+{
+   assert(m_started);
+
+   query_counter(&m_stop_time);
+
+   m_stopped = true;
+}
+
+double timer::get_elapsed_secs() const
+{
+   assert(m_started);
+   if (!m_started)
+      return 0;
+
+   timer_ticks stop_time = m_stop_time;
+   if (!m_stopped)
+      query_counter(&stop_time);
+
+   timer_ticks delta = stop_time - m_start_time;
+   return delta * g_inv_freq;
+}
+
+timer_ticks timer::get_elapsed_us() const
+{
+   assert(m_started);
+   if (!m_started)
+      return 0;
+
+   timer_ticks stop_time = m_stop_time;
+   if (!m_stopped)
+      query_counter(&stop_time);
+
+   timer_ticks delta = stop_time - m_start_time;
+   return (delta * 1000000ULL + (g_freq >> 1U)) / g_freq;
+}
+
+void timer::init()
+{
+   if (!g_inv_freq)
+   {
+      query_counter_frequency(&g_freq);
+      g_inv_freq = 1.0f / g_freq;
+
+      query_counter(&g_init_ticks);
+   }
+}
+
+timer_ticks timer::get_init_ticks()
+{
+   if (!g_inv_freq)
+      init();
+
+   return g_init_ticks;
+}
+
+timer_ticks timer::get_ticks()
+{
+   if (!g_inv_freq)
+      init();
+
+   timer_ticks ticks;
+   query_counter(&ticks);
+   return ticks - g_init_ticks;
+}
+
+double timer::ticks_to_secs(timer_ticks ticks)
+{
+   if (!g_inv_freq)
+      init();
+
+   return ticks * g_inv_freq;
+}
+
diff --git a/Tools/Dependencies/miniz/timer.h b/Tools/Dependencies/miniz/timer.h
@@ -0,0 +1,40 @@
+// File: timer.h
+#pragma once
+
+typedef unsigned long long timer_ticks;
+
+class timer
+{
+public:
+   timer();
+   timer(timer_ticks start_ticks);
+
+   void start();
+   void start(timer_ticks start_ticks);
+
+   void stop();
+
+   double get_elapsed_secs() const;
+   inline double get_elapsed_ms() const { return get_elapsed_secs() * 1000.0f; }
+   timer_ticks get_elapsed_us() const;
+
+   static void init();
+   static inline timer_ticks get_ticks_per_sec() { return g_freq; }
+   static timer_ticks get_init_ticks();
+   static timer_ticks get_ticks();
+   static double ticks_to_secs(timer_ticks ticks);
+   static inline double ticks_to_ms(timer_ticks ticks) { return ticks_to_secs(ticks) * 1000.0f; }
+   static inline double get_secs() { return ticks_to_secs(get_ticks()); }
+   static inline double get_ms() { return ticks_to_ms(get_ticks()); }
+
+private:
+   static timer_ticks g_init_ticks;
+   static timer_ticks g_freq;
+   static double g_inv_freq;
+
+   timer_ticks m_start_time;
+   timer_ticks m_stop_time;
+
+   bool m_started : 1;
+   bool m_stopped : 1;
+};

Original file line number	Diff line number	Diff line change
`@@ -1513,7 +1513,7 @@ void PolycodeFrame::showModal(UIWindow *modalChild) {`
`1513`	`1513`	`void PolycodeFrame::hideModal() {`
`1514`	`1514`	`if(modalChild) {`
`1515`	`1515`	`modalRoot->removeChild(modalChild);`
`1516`		`- modalChild->removeEventListener(this, UIEvent::CLOSE_EVENT);`
	`1516`	`+ modalChild->removeAllHandlers();`
`1517`	`1517`	`modalChild->hideWindow();`
`1518`	`1518`	`modalChild = NULL;`
`1519`	`1519`	`}`