Browse Source

Moved mojo.requesters to std.requesters; added some GLWindow docs.

Mark Sibly 9 years ago
parent
commit
5e987314a5

+ 12 - 2
modules/mojo/app/glwindow.monkey2

@@ -16,7 +16,9 @@ Class GLWindow Extends Window
 		Super.New( title,rect,flags )
 		Init()
 	End
-	
+
+	#rem monkeydoc Switches from shared GL context to private GL context.
+	#end
 	Method BeginGL()
 	
 #If __HOSTOS__="macos"
@@ -26,6 +28,8 @@ Class GLWindow Extends Window
 		SDL_GL_MakeCurrent( SDLWindow,_sdlGLContext )
 	End
 	
+	#rem monkeydoc Switches from private GL back to shared GL context.
+	#end
 	Method EndGL()
 
 #If __HOSTOS__="macos"
@@ -36,7 +40,12 @@ Class GLWindow Extends Window
 	End
 	
 	Protected
+
+	#rem monkeydoc Override this method with your mojo rendering code.
 	
+	Note: If you override this method, you must call Super.OnRender() at some point for [[OnRenderGL]] to be called.
+
+	#end
 	Method OnRender( canvas:Canvas ) Override
 	
 		BeginGL()
@@ -46,8 +55,9 @@ Class GLWindow Extends Window
 		EndGL()
 	End
 	
+	#rem monkeydoc Override this method with your custom GL rendering code.
+	#end
 	Method OnRenderGL() Virtual
-	
 	End
 	
 	Private

+ 0 - 1
modules/mojo/mojo.monkey2

@@ -42,7 +42,6 @@ Namespace mojo
 #Import "input/joystick"
 #Import "input/keycodes"
 
-#Import "requesters/requesters"
 #Import "audio/audio"
 
 Using emscripten..

+ 1 - 1
modules/mojo/requesters/native/requesters.cpp → modules/std/requesters/native/requesters.cpp

@@ -91,7 +91,7 @@ bbString bbRequesters::RequestFile( bbString title,bbString exts,bbBool save,bbS
 	int i=path.findLast( "\\" );
 	if( i!=-1 ){
 		dir=path.slice( 0,i );
-		file=path.slice( 1+1 );
+		file=path.slice( i+1 );
 	}else{
 		file=path;
 	}

+ 0 - 0
modules/mojo/requesters/native/requesters.h → modules/std/requesters/native/requesters.h


+ 0 - 0
modules/mojo/requesters/native/requesters.mm → modules/std/requesters/native/requesters.mm


+ 3 - 3
modules/mojo/requesters/requesters.monkey2 → modules/std/requesters/requesters.monkey2

@@ -1,5 +1,5 @@
 
-Namespace mojo.requesters
+Namespace std.requesters
 
 #If __DESKTOP_TARGET__
 
@@ -8,14 +8,14 @@ Namespace mojo.requesters
 #If __TARGET__="macos"
 
 	#Import "native/requesters.mm"
-	
+
 #Else
 
 	#Import "native/requesters.cpp"
 	
 	#if __TARGET__="windows"
 
-		#Import "<libcomdlg32.a>"
+		#Import "<libole32.a>"
 
 	#endif