Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2049 part 2: initialisation bugfix. Stopped splash screen on linux for now and toned down extra brightness on demo ship screen.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2050 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2009-02-11 13:09:24 +00:00
parent e6cc1b416e
commit f8b348be25
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/GameController.m
View File

@ -63,10 +63,6 @@ static GameController *sSharedController = nil;
- (id) init - (id) init
{ {
#if !OOLITE_HAVE_APPKIT
//try and show the basic SDL splash screen asap!
[self beginSplashScreen];
#endif
if (sSharedController != nil) if (sSharedController != nil)
{ {
[self release]; [self release];
@ -262,22 +258,20 @@ static GameController *sSharedController = nil;
- (void) beginSplashScreen - (void) beginSplashScreen
{ {
#if !OOLITE_HAVE_APPKIT #if !OOLITE_HAVE_APPKIT
//called twice from SDL
if(!gameView){ if(!gameView){
//initialise!
gameView = [MyOpenGLView alloc]; gameView = [MyOpenGLView alloc];
[gameView init]; [gameView init];
[gameView setGameController:self]; [gameView setGameController:self];
[gameView initSplashScreen]; [gameView initSplashScreen];
} else {
// TODO: enable writing to splash screen.
} }
#else #else
[gameView drawRect:[gameView bounds]];
#endif
[gameView drawRect:[gameView bounds]];
#endif
} }

4
src/SDL/MyOpenGLView.m
View File

@ -409,7 +409,7 @@ MA 02110-1301, USA.
#if OOLITE_WINDOWS #if OOLITE_WINDOWS
image = SDL_LoadBMP("Resources\\Images\\splash.bmp"); image = SDL_LoadBMP("Resources\\Images\\splash.bmp");
#elif OOLITE_LINUX #elif OOLITE_LINUX
image = SDL_LoadBMP("Resources/Images/splash.bmp"); //image = SDL_LoadBMP("Resources/Images/splash.bmp"); //TODO : splashscreen in linux
#endif #endif
if (image == NULL) if (image == NULL)
@ -472,7 +472,7 @@ MA 02110-1301, USA.
- (void) initialiseGLWithSize:(NSSize) v_size useVideoMode:(BOOL) v_mode - (void) initialiseGLWithSize:(NSSize) v_size useVideoMode:(BOOL) v_mode
{ {
int videoModeFlags; int videoModeFlags;
GLfloat sun_ambient[] = {0.3, 0.3, 0.3, 1.0}; GLfloat sun_ambient[] = {0.1, 0.1, 0.1, 1.0};
GLfloat sun_diffuse[] = {1.0, 1.0, 1.0, 1.0}; GLfloat sun_diffuse[] = {1.0, 1.0, 1.0, 1.0};
GLfloat sun_specular[] = {1.0, 1.0, 1.0, 1.0}; GLfloat sun_specular[] = {1.0, 1.0, 1.0, 1.0};
GLfloat sun_center_position[] = {4000000.0, 0.0, 0.0, 1.0}; GLfloat sun_center_position[] = {4000000.0, 0.0, 0.0, 1.0};