From a2ab1c81cebd2dae3bea718ae1439242a5a9fcd8 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 12 Sep 2010 16:40:32 +0900 Subject: [PATCH] A little more progress: loading a map does not seg. --- .../Bundles/MapEdit/MapEdit.gorm/data.classes | 83 ++++++++++++++++++ .../Bundles/MapEdit/MapEdit.gorm/objects.gorm | Bin 34091 -> 35451 bytes tools/Forge/Bundles/MapEdit/QuakeEd.m | 2 - 3 files changed, 83 insertions(+), 2 deletions(-) diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes index 83b1b67a9..1c3f7aab6 100644 --- a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes +++ b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes @@ -28,21 +28,74 @@ "changeInspector:", "changeXYLookUp:", "clear:", + "clearTexinfo:", + "cloneSelection:", + "decRotate:", + "decXScale:", + "decXShift:", + "decYScale:", + "decYShift:", "downFloor:", "drawMode:", + "flip_x:", + "flip_y:", + "flip_z:", "homeView:", + "incRotate:", + "incXScale:", + "incXShift:", + "incYScale:", + "incYShift:", + "makeEntity:", + "onlyShowMapTextures:", "openProject:", + "rotate_x:", + "rotate_y:", + "rotate_z:", "save:", "saveAs:", + "searchForTexture:", + "selectCompleteEntity:", + "selectCompletelyInside:", + "selectPartiallyInside:", "setBrushRegion:", + "setCurrentEntity:", "setModeRadio:", "setXYRegion:", + "shortBrush:", + "subtractSelection:", + "tallBrush:", "textCommand:", + "texturedefChanged:", "upFloor:", "updateAll:" ); Super = NSObject; }; + Map = { + Actions = ( + "setCurrentEntity:", + "cloneSelection:", + "makeEntity:", + "subtractSelection:", + "selectCompletelyInside:", + "selectPartiallyInside:", + "tallBrush:", + "shortBrush:", + "rotate_x:", + "rotate_y:", + "rotate_z:", + "flip_x:", + "flip_y:", + "flip_z:", + "selectCompleteEntity:" + ); + Outlets = ( + currentEntity, + oldselection + ); + Super = NSMutableArray; + }; QuakeEd = { Actions = ( "updateAll:", @@ -85,6 +138,36 @@ ); Super = NSWindow; }; + TexturePalette = { + Actions = ( + "searchForTexture:", + "clearTexinfo:", + "incXShift:", + "decXShift:", + "incYShift:", + "decYShift:", + "incRotate:", + "decRotate:", + "incXScale:", + "decXScale:", + "incYScale:", + "decYScale:", + "texturedefChanged:", + "onlyShowMapTextures:" + ); + Outlets = ( + textureList_i, + textureView_i, + searchField_i, + sizeField_i, + field_Xshift_i, + field_Yshift_i, + field_Xscale_i, + field_Yscale_i, + field_Rotate_i + ); + Super = NSObject; + }; XYView = { Actions = ( "setModeRadio:", diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm index 6bd6a4e99ec3acc93cb1f282393cdc38f315e9df..aade3fc21bcb9506aa3140e5b967a6201f0938c0 100644 GIT binary patch literal 35451 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 Bt>^#% diff --git a/tools/Forge/Bundles/MapEdit/QuakeEd.m b/tools/Forge/Bundles/MapEdit/QuakeEd.m index e13ac474a..d0465e67b 100644 --- a/tools/Forge/Bundles/MapEdit/QuakeEd.m +++ b/tools/Forge/Bundles/MapEdit/QuakeEd.m @@ -348,8 +348,6 @@ App delegate methods userInfo: nil repeats:YES]; path =[NSBezierPath new]; - - [[Map alloc] init]; } -(void)applicationDidFinishLaunching:(NSNotification *) notification