From 68a55eaf8dc35c34a6113984d63d06d20e0ec259 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 12 Sep 2010 14:31:59 +0900 Subject: [PATCH] Get some screen updates happening. --- tools/Forge/Bundles/MapEdit/CameraView.m | 2 +- tools/Forge/Bundles/MapEdit/GNUmakefile | 2 +- .../Bundles/MapEdit/MapEdit.gorm/objects.gorm | Bin 31825 -> 34091 bytes tools/Forge/Bundles/MapEdit/QuakeEd.h | 8 +-- tools/Forge/Bundles/MapEdit/QuakeEd.m | 68 ++++++++---------- tools/Forge/Bundles/MapEdit/QuakeEd_main.m | 22 ++++++ tools/Forge/Bundles/MapEdit/XYView.m | 5 +- tools/Forge/Bundles/MapEdit/ZView.m | 17 ++--- 8 files changed, 70 insertions(+), 54 deletions(-) diff --git a/tools/Forge/Bundles/MapEdit/CameraView.m b/tools/Forge/Bundles/MapEdit/CameraView.m index ef8d3c59d..9bc537f1c 100644 --- a/tools/Forge/Bundles/MapEdit/CameraView.m +++ b/tools/Forge/Bundles/MapEdit/CameraView.m @@ -457,7 +457,7 @@ drawWire drawSelf =================== */ --drawSelf:(NSRect)rects :(int)rectCount +-drawRect:(NSRect)rects { float drawtime = 0; diff --git a/tools/Forge/Bundles/MapEdit/GNUmakefile b/tools/Forge/Bundles/MapEdit/GNUmakefile index 294e007e8..175729408 100644 --- a/tools/Forge/Bundles/MapEdit/GNUmakefile +++ b/tools/Forge/Bundles/MapEdit/GNUmakefile @@ -10,7 +10,7 @@ SUBPROJECTS= # PACKAGE_NAME= QuakeEd APP_NAME= QuakeEd -QuakeEd_PRINCIPAL_CLASS= NSApplication +QuakeEd_PRINCIPAL_CLASS= QuakeEdApp QuakeEd_APPLICATION_ICON= # diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm index 3342d8d115a225c3b60594a157271c862f8eb252..6bd6a4e99ec3acc93cb1f282393cdc38f315e9df 100644 GIT binary patch literal 34091 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 Bt>^#% literal 31825 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 IcS`2}A8CP)<^TWy diff --git a/tools/Forge/Bundles/MapEdit/QuakeEd.h b/tools/Forge/Bundles/MapEdit/QuakeEd.h index c2751b9ab..cbd90a640 100644 --- a/tools/Forge/Bundles/MapEdit/QuakeEd.h +++ b/tools/Forge/Bundles/MapEdit/QuakeEd.h @@ -56,7 +56,6 @@ void qprintf (char *fmt, ...); // prints text to cmd_out_i // instance drawing -redrawInstance; // erase and redraw all instance now --appDidInit:sender; -appWillTerminate:sender; -openProject:sender; @@ -82,10 +81,7 @@ void qprintf (char *fmt, ...); // prints text to cmd_out_i -doOpen:(char *) fname; --saveBSP:(char *) -cmdline -dialog:(BOOL) - wt; +-saveBSP:(char *)cmdline dialog:(BOOL)wt; -BSP_Full:sender; -BSP_FastVis:sender; @@ -94,6 +90,8 @@ dialog:(BOOL) -BSP_stop:sender; -BSP_entities:sender; +-applicationDefined:(NSEvent *) theEvent; + // // UI querie for other objects // diff --git a/tools/Forge/Bundles/MapEdit/QuakeEd.m b/tools/Forge/Bundles/MapEdit/QuakeEd.m index 740339301..6a94af37b 100644 --- a/tools/Forge/Bundles/MapEdit/QuakeEd.m +++ b/tools/Forge/Bundles/MapEdit/QuakeEd.m @@ -123,31 +123,6 @@ Every five minutes, save a modified map [map_i writeStats]; } -/* -=============== -init -=============== -*/ --initContent: (NSRect) contentRect style: (int) aStyle backing: (int) backingType buttonMask: (int) mask defer:(BOOL) flag -{ - [super initWithContentRect: contentRect styleMask: aStyle backing: backingType defer:flag]; - - // XXX [self addToEventMask: - // XXX NSRightMouseDragged|NSLeftMouseDragged]; - - // XXX malloc_error(My_Malloc_Error); - - quakeed_i = self; - dirty = autodirty = NO; - - [NSTimer timerWithTimeInterval: 5 * 60 target: self selector:@selector - (AutoSave) - userInfo: nil repeats:YES]; - - path =[NSBezierPath new]; - - return self; -} #define FN_TEMPSAVE "/qcache/temp.map" -setDefaultFilename @@ -194,7 +169,7 @@ postappdefined (void) windowNumber: 0 context:[NSApp context] subtype: 0 data1: 0 data2:0]; [NSApp postEvent: ev atStart:NO]; -//printf ("posted\n"); + Sys_Printf ("posted\n"); updateinflight = YES; } @@ -320,23 +295,25 @@ App delegate methods updateinflight = NO; -//printf ("serviced\n"); + Sys_Printf ("serviced\n"); // update screen - evp =[NSApp nextEventMatchingMask: NSAnyEventMask untilDate:[NSDate - distantPast] - inMode: NSEventTrackingRunLoopMode dequeue:NO]; + evp = [NSApp nextEventMatchingMask: NSAnyEventMask + untilDate: [NSDate distantPast] + inMode: NSEventTrackingRunLoopMode + dequeue: NO]; if (evp) { postappdefined (); return self; } + Sys_Printf ("updating %d %d\n", (int)[map_i count], (int)[[map_i currentEntity] count]); [self disableFlushWindow]; - if ([map_i count] !=[entitycount_i intValue]) + if ([map_i count] != [entitycount_i intValue]) [entitycount_i setIntValue:[map_i count]]; - if ([[map_i currentEntity] count] !=[brushcount_i intValue]) + if ([[map_i currentEntity] count] != [brushcount_i intValue]) [brushcount_i setIntValue:[[map_i currentEntity] count]]; if (updatecamera) @@ -356,7 +333,24 @@ App delegate methods return self; } --appDidInit:sender +-(void)awakeFromNib +{ + // XXX [self addToEventMask: + // XXX NSRightMouseDragged|NSLeftMouseDragged]; + + // XXX malloc_error(My_Malloc_Error); + + quakeed_i = self; + dirty = autodirty = NO; + + [NSTimer timerWithTimeInterval: 5 * 60 target: self selector:@selector + (AutoSave) + userInfo: nil repeats:YES]; + + path =[NSBezierPath new]; +} + +-(void)applicationDidFinishLaunching:(NSNotification *) notification { NSArray *screens; NSScreen *scrn; @@ -368,7 +362,7 @@ App delegate methods [project_i initProject]; [xyview_i setModeRadio:xy_drawmode_i]; - // because xy view is inside + // because xy view is inside // scrollview and can't be // connected directly in IB @@ -391,8 +385,6 @@ App delegate methods Sys_Printf ("ready.\n"); //malloc_debug(-1); // DEBUG - - return self; } -appWillTerminate:sender @@ -888,6 +880,7 @@ keyDown -keyDown:(NSEvent *) theEvent { int ch; + const char *chars; // function keys switch ([theEvent keyCode]) { @@ -934,7 +927,8 @@ keyDown } // portable things - ch = tolower ([[theEvent characters] cString][0]); + chars = [[theEvent characters] cString]; + ch = chars ? tolower (chars[0]) : 0; switch (ch) { case KEY_RIGHTARROW: diff --git a/tools/Forge/Bundles/MapEdit/QuakeEd_main.m b/tools/Forge/Bundles/MapEdit/QuakeEd_main.m index 54be2c713..b2170c181 100644 --- a/tools/Forge/Bundles/MapEdit/QuakeEd_main.m +++ b/tools/Forge/Bundles/MapEdit/QuakeEd_main.m @@ -1,5 +1,27 @@ #include +#include "QF/sys.h" + +#include "QuakeEd.h" + +@interface QuakeEdApp:NSApplication +-(void)sendEvent:(NSEvent *) evt; +@end + +@implementation QuakeEdApp + +-(void)sendEvent:(NSEvent *) evt; +{ + if ([evt type] == NSApplicationDefined) { + Sys_Printf ("QuakeEdApp sendEvent\n"); + [quakeed_i applicationDefined: evt]; + } else { + [super sendEvent:evt]; + } +} + +@end + int main (int argc, const char *argv[]) { diff --git a/tools/Forge/Bundles/MapEdit/XYView.m b/tools/Forge/Bundles/MapEdit/XYView.m index f77586144..55ccfc600 100644 --- a/tools/Forge/Bundles/MapEdit/XYView.m +++ b/tools/Forge/Bundles/MapEdit/XYView.m @@ -786,7 +786,7 @@ drawSelf */ NSRect xy_draw_rect; --drawSelf: (NSRect) rects:(int) rectCount +-drawRect: (NSRect) rects { static float drawtime; // static to shut up compiler warning @@ -799,7 +799,8 @@ NSRect xy_draw_rect; // setup for text // PSselectfont("Helvetica-Medium",10/scale); - GSSetFont (DEFCTXT,[NSFont fontWithName: @"Helvetica-Medium" size:10 / scale]); + //GSSetFont (DEFCTXT,[NSFont fontWithName: @"Helvetica-Medium" size:10 / scale]); + [[NSFont systemFontOfSize: 10] set]; PSrotate (0); if (drawmode == dr_texture || drawmode == dr_flat) diff --git a/tools/Forge/Bundles/MapEdit/ZView.m b/tools/Forge/Bundles/MapEdit/ZView.m index 54a907f47..0fbc58c89 100644 --- a/tools/Forge/Bundles/MapEdit/ZView.m +++ b/tools/Forge/Bundles/MapEdit/ZView.m @@ -303,7 +303,7 @@ Rect is in global world (unscaled) coordinates ============ */ --drawGrid:(const NSRect *) rect +-drawGrid:(NSRect) rect { int y, stopy; float top, bottom; @@ -321,8 +321,8 @@ Rect is in global world (unscaled) coordinates left = _bounds.origin.x; right = 24; - bottom = rect->origin.y - 1; - top = rect->origin.y + rect->size.height + 2; + bottom = rect.origin.y - 1; + top = rect.origin.y + rect.size.height + 2; // // grid @@ -389,7 +389,8 @@ Rect is in global world (unscaled) coordinates [path removeAllPoints]; PSsetgray (0); // for text - GSSetFont (DEFCTXT,[NSFont fontWithName: @"Helvetica-Medium" size:10 / scale]); + //GSSetFont (DEFCTXT,[NSFont fontWithName: @"Helvetica-Medium" size:10 / scale]); + [[NSFont systemFontOfSize: 10] set]; PSrotate (0); for (; y <= stopy; y += 64) { @@ -439,7 +440,7 @@ drawSelf =============================================================================== */ --drawSelf: (const NSRect *) rects:(int) rectCount +-drawRect: (NSRect) rects { NSRect visRect; @@ -448,13 +449,13 @@ drawSelf // allways draw the entire bar visRect =[self visibleRect]; - rects = &visRect; + rects = visRect; // erase window - NSEraseRect (rects[0]); + NSEraseRect (rects); // draw grid - [self drawGrid:&rects[0]]; + [self drawGrid:rects]; // draw zplane // [self drawZplane];