From 6ede64c663c8bdfda4cc7d5a74b5448f6f4e7698 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 12 Sep 2010 22:40:50 +0900 Subject: [PATCH] Camera view seems to work moderately well. --- .../Bundles/MapEdit/MapEdit.gorm/data.classes | 10 ++++++++++ .../Bundles/MapEdit/MapEdit.gorm/objects.gorm | Bin 39400 -> 49503 bytes tools/Forge/Bundles/MapEdit/QuakeEd.m | 6 +++++- tools/Forge/Bundles/MapEdit/TexturePalette.m | 10 ++++------ 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes index 5b141bab6..f79dd054d 100644 --- a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes +++ b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes @@ -74,6 +74,7 @@ "setCurrentProject:", "setFlags:", "setModeRadio:", + "setParent:", "setXYRegion:", "shortBrush:", "subtractSelection:", @@ -226,6 +227,15 @@ ); Super = NSObject; }; + TextureView = { + Actions = ( + "setParent:" + ); + Outlets = ( + parent_i + ); + Super = NSView; + }; Things = { Actions = ( "reloadEntityClasses:", diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm index 730715d71814611c11900e98d2a37cffb90a170b..3b3a5c8d6c991941584371297e8e51a9f6b9920e 100644 GIT binary patch literal 49503 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%0AgPIDRO$-xn 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 literal 39400 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 diff --git a/tools/Forge/Bundles/MapEdit/QuakeEd.m b/tools/Forge/Bundles/MapEdit/QuakeEd.m index d0465e67b..d457eeb92 100644 --- a/tools/Forge/Bundles/MapEdit/QuakeEd.m +++ b/tools/Forge/Bundles/MapEdit/QuakeEd.m @@ -306,7 +306,11 @@ App delegate methods postappdefined (); return self; } - Sys_Printf ("updating %d %d\n", (int)[map_i count], (int)[[map_i currentEntity] count]); + Sys_Printf ("updating %d %d %p %d %p %d\n", + (int)[map_i count], + (int)[[map_i currentEntity] count], + entitycount_i, [entitycount_i intValue], + brushcount_i, [brushcount_i intValue]); [self disableFlushWindow]; diff --git a/tools/Forge/Bundles/MapEdit/TexturePalette.m b/tools/Forge/Bundles/MapEdit/TexturePalette.m index bffea9565..0b9420724 100644 --- a/tools/Forge/Bundles/MapEdit/TexturePalette.m +++ b/tools/Forge/Bundles/MapEdit/TexturePalette.m @@ -163,7 +163,6 @@ void TEX_InitFromWad (char *path) { int i; - char local[1024]; char newpath[1024]; float start, stop; wad_t *wad; @@ -189,7 +188,6 @@ TEX_InitFromWad (char *path) lumpinfo = wad->lumps; if (strcmp (lumpinfo->name, "PALETTE")) { - unlink (local); Sys_Error ("TEX_InitFromWad: %s doesn't have palette as 0", path); } @@ -207,7 +205,7 @@ TEX_InitFromWad (char *path) stop = Sys_DoubleTime (); - Sys_Printf ("loaded %s (%5.1f)\n", local, stop - start); + Sys_Printf ("loaded %s (%5.1f)\n", newpath, stop - start); } /* @@ -273,9 +271,9 @@ TEX_ForName (char *name) if (textureList_i) [textureList_i empty]; else - textureList_i =[[Storage alloc] - initCount: 0 elementSize:sizeof (texpal_t) - description: NULL]; + textureList_i = [[Storage alloc] initCount: 0 + elementSize: sizeof (texpal_t) + description: NULL]; // Init STORAGE