Thread: [Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [392] trunk/fuse/fusepb/views/ DisplayOpenGL
Brought to you by:
fredm
Menu
▾
▴
fuse-for-macosx-commits
|
From: <fr...@us...> - 2007-06-20 03:56:22
|
Revision: 392
http://svn.sourceforge.net/fuse-for-macosx/?rev=392&view=rev
Author: fredm
Date: 2007-06-19 20:56:24 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
Fix texture colours on bigendian machines.
Modified Paths:
--------------
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-06-20 02:25:45 UTC (rev 391)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-06-20 03:56:24 UTC (rev 392)
@@ -65,9 +65,16 @@
int i;
for( i = 0; i < targetWidth * targetHeight; i++ ) {
+#ifdef WORDS_BIGENDIAN
+ pixels[i*4+3] = red ? pixels[i*4+0] : 0; // r on ppc
+ pixels[i*4+2] = red ? 0 : pixels[i*4+1]; // g on ppc
+ pixels[i*4+0] = 0;
+ pixels[i*4+1] = 0;
+#else /* #ifdef WORDS_BIGENDIAN */
pixels[i*4+0] = red ? pixels[i*4+0] : 0; // r on i386
pixels[i*4+1] = red ? 0 : pixels[i*4+1]; // g on i386
pixels[i*4+2] = 0;
+#endif /* #ifdef WORDS_BIGENDIAN */
}
[bitmap2 release];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-06-24 00:56:59
|
Revision: 397
http://svn.sourceforge.net/fuse-for-macosx/?rev=397&view=rev
Author: fredm
Date: 2007-06-23 17:56:44 -0700 (Sat, 23 Jun 2007)
Log Message:
-----------
Update disk status icon.
Modified Paths:
--------------
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-06-24 00:55:27 UTC (rev 396)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-06-24 00:56:44 UTC (rev 397)
@@ -902,7 +902,7 @@
-(void) setDiskState:(NSNumber*)state
{
disk_state = [state unsignedCharValue];
- //[[FuseController singleton] setDiskState:state];
+ [[FuseController singleton] setDiskState:state];
}
-(void) setTapeState:(NSNumber*)state
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-06-24 01:06:11
|
Revision: 398
http://svn.sourceforge.net/fuse-for-macosx/?rev=398&view=rev
Author: fredm
Date: 2007-06-23 18:06:12 -0700 (Sat, 23 Jun 2007)
Log Message:
-----------
Update microdrive status icon.
Modified Paths:
--------------
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-06-24 00:56:44 UTC (rev 397)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-06-24 01:06:12 UTC (rev 398)
@@ -914,7 +914,7 @@
-(void) setMdrState:(NSNumber*)state
{
mdr_state = [state unsignedCharValue];
- //[[FuseController singleton] setMdrState:state];
+ [[FuseController singleton] setMdrState:state];
}
-(ui_confirm_save_t) confirmSave:(NSString*)theMessage
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-06-30 12:41:48
|
Revision: 407
http://svn.sourceforge.net/fuse-for-macosx/?rev=407&view=rev
Author: fredm
Date: 2007-06-30 05:41:50 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Must refresh display on resize or switch to/from fullscreen.
Modified Paths:
--------------
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-06-29 13:16:48 UTC (rev 406)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-06-30 12:41:50 UTC (rev 407)
@@ -144,6 +144,8 @@
if( !ui_mouse_grabbed ) ui_mouse_grabbed = ui_mouse_grab( 0 );
}
}
+
+ statusbar_updated = YES;
}
-(IBAction) zoom:(id)sender
@@ -533,7 +535,7 @@
glMatrixMode( GL_MODELVIEW );
glLoadIdentity();
- [self setNeedsDisplay:YES];
+ statusbar_updated = YES;
}
/* scrolled, moved or resized */
@@ -556,7 +558,7 @@
glMatrixMode( GL_MODELVIEW );
glLoadIdentity();
- [self setNeedsDisplay:YES];
+ statusbar_updated = YES;
}
-(void) destroyTexture
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-07-22 12:41:18
|
Revision: 433
http://svn.sourceforge.net/fuse-for-macosx/?rev=433&view=rev
Author: fredm
Date: 2007-07-22 05:41:19 -0700 (Sun, 22 Jul 2007)
Log Message:
-----------
Stop display link when the emulator is paused.
Modified Paths:
--------------
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-07-16 13:25:23 UTC (rev 432)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-07-22 12:41:19 UTC (rev 433)
@@ -51,9 +51,9 @@
CVOptionFlags *flagsOut,
void *displayLinkContext)
{
- CVReturn error =
+ CVReturn error =
[(DisplayOpenGLView*) displayLinkContext displayFrame:inOutputTime];
- return error;
+ return error;
}
@implementation DisplayOpenGLView
@@ -643,12 +643,23 @@
-(void) pause
{
[proxy_emulator pause];
+
+ CVReturn error = CVDisplayLinkStop( displayLink );
+ if( error ) {
+ NSLog( @"error starting displayLink:%d", error );
+ }
+
/* FIXME: Show paused status somehow */
}
-(void) unpause
{
[proxy_emulator unpause];
+
+ CVReturn error = CVDisplayLinkStart( displayLink );
+ if( error ) {
+ NSLog( @"error starting displayLink:%d", error );
+ }
}
-(void) reset
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-07-28 12:44:45
|
Revision: 440
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=440&view=rev
Author: fredm
Date: 2007-07-28 05:44:41 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
Don't run the display link when the emulator is paused or we don't have a screen
texture initialised.
Modified Paths:
--------------
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-07-28 03:39:33 UTC (rev 439)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-07-28 12:44:41 UTC (rev 440)
@@ -249,11 +249,6 @@
NSLog( @"Callback created with error:%d", error );
return;
}
-
- error = CVDisplayLinkStart( displayLink );
- if( error ) {
- NSLog( @"error starting displayLink:%d", error );
- }
}
- (void)windowWillClose:(NSNotification *)notification
@@ -549,6 +544,11 @@
return;
}
+ CVReturn error = CVDisplayLinkStop( displayLink );
+ if( error ) {
+ NSLog( @"error starting displayLink:%d", error );
+ }
+
glDeleteTextures( MAX_SCREEN_BUFFERS, screenTexId );
for(i = 0; i < MAX_SCREEN_BUFFERS; i++)
{
@@ -609,6 +609,12 @@
screenTex[i].pixels );
}
screenTexInitialised = YES;
+
+ CVReturn error = CVDisplayLinkStart( displayLink );
+ if( error ) {
+ NSLog( @"error starting displayLink:%d", error );
+ }
+
[view_lock unlock];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-08-12 00:30:32
|
Revision: 452
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=452&view=rev
Author: fredm
Date: 2007-08-11 17:30:35 -0700 (Sat, 11 Aug 2007)
Log Message:
-----------
Use correct offset for emulator top right texture.
Modified Paths:
--------------
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-08-06 02:39:03 UTC (rev 451)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-08-12 00:30:35 UTC (rev 452)
@@ -427,7 +427,7 @@
glTexCoord2f( (float)(screenTex[currentScreenTex].image_width +
screenTex[currentScreenTex].image_xoffset),
- (float)screenTex[currentScreenTex].image_xoffset
+ (float)screenTex[currentScreenTex].image_yoffset
);
glVertex2f( 1.0f, 1.0f );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X