Ivan Safrin il y a 13 ans
Parent
commit
33d6caed48

+ 3 - 1
Core/Contents/Include/PolySDLCore.h

@@ -41,7 +41,7 @@ namespace Polycode {
 		
 		
 	public:
 	public:
 		
 		
-		SDLCore(PolycodeView *view, int xRes, int yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel, int frameRate);
+		SDLCore(PolycodeView *view, int xRes, int yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel, int frameRate, int monitorIndex=-1);
 		~SDLCore();
 		~SDLCore();
 
 
 		void enableMouse(bool newval);
 		void enableMouse(bool newval);
@@ -65,6 +65,8 @@ namespace Polycode {
 		std::vector<String> openFilePicker(std::vector<CoreFileExtension> extensions, bool allowMultiple);
 		std::vector<String> openFilePicker(std::vector<CoreFileExtension> extensions, bool allowMultiple);
 		void resizeTo(int xRes, int yRes);
 		void resizeTo(int xRes, int yRes);
 
 
+		void openURL(String url);
+
 	private:
 	private:
 		
 		
 		
 		

+ 4 - 1
Core/Contents/Source/PolySDLCore.cpp

@@ -41,7 +41,7 @@ long getThreadID() {
 	return (long)pthread_self();
 	return (long)pthread_self();
 }
 }
 
 
-SDLCore::SDLCore(PolycodeView *view, int xRes, int yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel, int frameRate) : Core(xRes, yRes, fullScreen, vSync, aaLevel, anisotropyLevel, frameRate) {
+SDLCore::SDLCore(PolycodeView *view, int xRes, int yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel, int frameRate, int monitorIndex) : Core(xRes, yRes, fullScreen, vSync, aaLevel, anisotropyLevel, frameRate, monitorIndex) {
 
 
 	String *windowTitle = (String*)view->windowData;
 	String *windowTitle = (String*)view->windowData;
 
 
@@ -112,6 +112,9 @@ SDLCore::~SDLCore() {
 	SDL_Quit();
 	SDL_Quit();
 }
 }
 
 
+void SDLCore::openURL(String url) {
+}
+
 int SDLThreadFunc(void *data) {
 int SDLThreadFunc(void *data) {
 	Threaded *target = (Threaded*)data;
 	Threaded *target = (Threaded*)data;
 	target->runThread();
 	target->runThread();

+ 0 - 1
Examples/C++/Contents/2DShapes/HelloPolycodeApp.h

@@ -6,7 +6,6 @@ using namespace Polycode;
 class HelloPolycodeApp : public EventHandler {
 class HelloPolycodeApp : public EventHandler {
 public:
 public:
     HelloPolycodeApp(PolycodeView *view);
     HelloPolycodeApp(PolycodeView *view);
-    ~HelloPolycodeApp();
     bool Update();
     bool Update();
     
     
 private:
 private:

+ 3 - 1
Modules/Contents/TUIO/Include/osc/OscHostEndianness.h

@@ -61,7 +61,9 @@
 
 
 #else
 #else
 
 
-#error please edit OSCHostEndianness.h to configure endianness
+#define OSC_HOST_LITTLE_ENDIAN 1
+#undef OSC_HOST_BIG_ENDIAN
+//#error please edit OSCHostEndianness.h to configure endianness
 
 
 #endif
 #endif