diff --git a/ChangeLog b/ChangeLog index 8f6ccf70..966a156e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-06-20 20:11 Gregory John Casamento + + * GNUmakefile.preamble: Remove dependency on GL. + * GormCore/GormOpenGLView.h: Make a subclass of NSView. + * GormCore/GormOpenGLView.m: Comment out uneeded code. + 2005-06-20 19:32 Gregory John Casamento * GNUmakefile.preamble: Add -lGL to ADDITIONAL_LIBS diff --git a/GNUmakefile.preamble b/GNUmakefile.preamble index d70573bf..9f6674a2 100644 --- a/GNUmakefile.preamble +++ b/GNUmakefile.preamble @@ -28,8 +28,7 @@ ADDITIONAL_GUI_LIBS += \ -lGormCore \ -lGorm \ -lGormObjCHeaderParser \ - -lGormPrefs \ - -lGL + -lGormPrefs ADDITIONAL_INCLUDE_DIRS += \ -IInterfaceBuilder \ diff --git a/GormCore/GormOpenGLView.h b/GormCore/GormOpenGLView.h index 771dfa32..01e13616 100644 --- a/GormCore/GormOpenGLView.h +++ b/GormCore/GormOpenGLView.h @@ -26,11 +26,11 @@ #ifndef INCLUDED_GormOpenGLView_h #define INCLUDED_GormOpenGLView_h -#include +#include @class NSTimer; -@interface GormOpenGLView : NSOpenGLView +@interface GormOpenGLView : NSView { float rtri; NSTimer *timer; diff --git a/GormCore/GormOpenGLView.m b/GormCore/GormOpenGLView.m index 2a3854be..050eebbe 100644 --- a/GormCore/GormOpenGLView.m +++ b/GormCore/GormOpenGLView.m @@ -25,27 +25,30 @@ #include #include -#include -#include +#include +// #include +// #include @implementation GormOpenGLView - (id) initWithFrame: (NSRect)rect { if((self = [super initWithFrame: rect]) != nil) { + /* rtri = 0.0f; timer = [NSTimer scheduledTimerWithTimeInterval: 0.05 target: self selector: @selector(oneStep) userInfo: nil repeats: YES]; + */ } return self; } - (void) dealloc { - [timer invalidate]; + // [timer invalidate]; [super dealloc]; } @@ -53,14 +56,15 @@ { // rotate. // rtri -= 0.2f; - rtri = 0.5f; // fabs( sin( 2.0 * M_PI * [startTime timeIntervalSinceNow] ) ) ; - + rtri = 0.5f; [self setNeedsDisplay: YES]; } - (void) drawRect: (NSRect)rect { // do nothing for now... + [[NSColor blackColor] set]; + PSrectfill(NSMinX(rect), NSMinY(rect), NSWidth(rect), NSHeight(rect)); } @end