From 37c2e0937c44e8cfac3a9ccb1a02791b8557774a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 12 Sep 2010 18:12:02 +0900
Subject: [PATCH] Get progs source scanning working.

Of course, this is if the environment is set up just right, but it's
another step towards something to fix.
---
 tools/Forge/Bundles/MapEdit/EntityClass.m     |   3 +-
 .../Bundles/MapEdit/MapEdit.gorm/data.classes |  78 ++++++++++++
 .../Bundles/MapEdit/MapEdit.gorm/objects.gorm | Bin 35451 -> 39400 bytes
 tools/Forge/Bundles/MapEdit/Preferences.m     |  12 +-
 tools/Forge/Bundles/MapEdit/Project.m         |  15 ++-
 tools/Forge/Bundles/MapEdit/SetBrush.m        | 115 +++++++++---------
 tools/Forge/Bundles/MapEdit/Things.m          |   1 +
 7 files changed, 155 insertions(+), 69 deletions(-)

diff --git a/tools/Forge/Bundles/MapEdit/EntityClass.m b/tools/Forge/Bundles/MapEdit/EntityClass.m
index 8a20a39ca..7924e841a 100644
--- a/tools/Forge/Bundles/MapEdit/EntityClass.m
+++ b/tools/Forge/Bundles/MapEdit/EntityClass.m
@@ -41,8 +41,7 @@ parse_vector (script_t * script, vec3_t vec)
 //
 // /*QUAKED func_door (0 .5 .8) ? START_OPEN STONE_SOUND DOOR_DONT_LINK GOLD_KEY SILVER_KEY
 
--initFromText:(const char *)
-text        source:(const char *) filename
+-initFromText:(const char *) text source:(const char *) filename
 {
 	const char *t;
 	size_t      len;
diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes
index 1c3f7aab6..5b141bab6 100644
--- a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes
+++ b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes
@@ -20,6 +20,8 @@
 	    "BSP_entities:",
 	    "BSP_relight:",
 	    "BSP_stop:",
+	    "UIChanged:",
+	    "addPair:",
 	    "appDidInit:",
 	    "appWillTerminate:",
 	    "applyRegion:",
@@ -28,13 +30,18 @@
 	    "changeInspector:",
 	    "changeXYLookUp:",
 	    "clear:",
+	    "clearBspOutput:",
 	    "clearTexinfo:",
+	    "clickedOnMap:",
+	    "clickedOnWad:",
 	    "cloneSelection:",
 	    "decRotate:",
 	    "decXScale:",
 	    "decXShift:",
 	    "decYScale:",
 	    "decYShift:",
+	    "delPair:",
+	    "doubleClickEntity:",
 	    "downFloor:",
 	    "drawMode:",
 	    "flip_x:",
@@ -49,6 +56,7 @@
 	    "makeEntity:",
 	    "onlyShowMapTextures:",
 	    "openProject:",
+	    "reloadEntityClasses:",
 	    "rotate_x:",
 	    "rotate_y:",
 	    "rotate_z:",
@@ -57,9 +65,14 @@
 	    "searchForTexture:",
 	    "selectCompleteEntity:",
 	    "selectCompletelyInside:",
+	    "selectEntity:",
 	    "selectPartiallyInside:",
+	    "setAngle:",
 	    "setBrushRegion:",
+	    "setBspSound:",
 	    "setCurrentEntity:",
+	    "setCurrentProject:",
+	    "setFlags:",
 	    "setModeRadio:",
 	    "setXYRegion:",
 	    "shortBrush:",
@@ -96,6 +109,51 @@
 	);
 	Super = NSMutableArray;
     };
+    Preferences = {
+	Actions = (
+	    "setBspSound:",
+	    "setCurrentProject:",
+	    "UIChanged:"
+	);
+	Outlets = (
+	    bspSound_i,
+	    startproject_i,
+	    bspSoundField_i,
+	    brushOffset_i,
+	    showBSP_i,
+	    startwad_i,
+	    xlight_i,
+	    ylight_i,
+	    zlight_i
+	);
+	Super = NSObject;
+    };
+    Project = {
+	Actions = (
+	    "clearBspOutput:",
+	    "clickedOnMap:",
+	    "clickedOnWad:"
+	);
+	Outlets = (
+	    projectInfo,
+	    basepathinfo_i,
+	    mapbrowse_i,
+	    currentmap_i,
+	    mapList,
+	    descList,
+	    wadList,
+	    pis_panel_i,
+	    pis_basepath_i,
+	    pis_wads_i,
+	    pis_fullvis_i,
+	    pis_fastvis_i,
+	    pis_novis_i,
+	    pis_relight_i,
+	    pis_leaktest_i,
+	    BSPoutput_i
+	);
+	Super = NSObject;
+    };
     QuakeEd = {
 	Actions = (
 	    "updateAll:",
@@ -168,6 +226,26 @@
 	);
 	Super = NSObject;
     };
+    Things = {
+	Actions = (
+	    "reloadEntityClasses:",
+	    "selectEntity:",
+	    "doubleClickEntity:",
+	    "addPair:",
+	    "delPair:",
+	    "setAngle:",
+	    "setFlags:"
+	);
+	Outlets = (
+	    entity_browser_i,
+	    entity_comment_i,
+	    prog_path_i,
+	    keyInput_i,
+	    valueInput_i,
+	    flags_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 aade3fc21bcb9506aa3140e5b967a6201f0938c0..730715d71814611c11900e98d2a37cffb90a170b 100644
GIT binary patch
literal 39400
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

literal 35451
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
L!s=#ecKrVVZ%&GU

diff --git a/tools/Forge/Bundles/MapEdit/Preferences.m b/tools/Forge/Bundles/MapEdit/Preferences.m
index d0181286e..9f0d15768 100644
--- a/tools/Forge/Bundles/MapEdit/Preferences.m
+++ b/tools/Forge/Bundles/MapEdit/Preferences.m
@@ -1,3 +1,5 @@
+#include <unistd.h>
+
 #include "QF/sys.h"
 
 #include "Preferences.h"
@@ -189,12 +191,14 @@ _atof (const char *c)
 		path = "";
 	strcpy (bspSound, path);
 
-	if (bspSound_i)
+	if (bspSound_i) {
 		[bspSound_i release];
-	bspSound_i =[[NSSound alloc] initWithContentsOfFile: [NSString stringWithCString:bspSound]];
+		bspSound_i = nil;
+	}
+	if (path[0] && access (path, R_OK))
+		bspSound_i =[[NSSound alloc] initWithContentsOfFile: [NSString stringWithCString:bspSound] byReference: YES];
 	if (!bspSound_i) {
-		strcpy (bspSound, "/NextLibrary/Sounds/Funk.snd");
-		bspSound_i =[[NSSound alloc] initWithContentsOfFile: [NSString stringWithCString:bspSound]];
+		return self;
 	}
 
 	[bspSoundField_i setStringValue: [NSString stringWithCString:bspSound]];
diff --git a/tools/Forge/Bundles/MapEdit/Project.m b/tools/Forge/Bundles/MapEdit/Project.m
index d01520ba5..18570a5e3 100644
--- a/tools/Forge/Bundles/MapEdit/Project.m
+++ b/tools/Forge/Bundles/MapEdit/Project.m
@@ -6,6 +6,7 @@
 
 #include <unistd.h>
 
+#include "QF/quakefs.h"
 #include "QF/sys.h"
 
 #include "Project.h"
@@ -36,19 +37,21 @@ id          project_i;
 -initVars
 {
 	char       *s;
+	const char *pe;
 
 	s =[preferences_i getProjectPath];
-	// XXX StripFilename(s);
+	pe = QFS_SkipPath (s);
+	s[pe - s] = 0;
 	strcpy (path_basepath, s);
 
 	strcpy (path_progdir, s);
-	strcat (path_progdir, "/" SUBDIR_ENT);
+	strcat (path_progdir, SUBDIR_ENT);
 
 	strcpy (path_mapdirectory, s);
-	strcat (path_mapdirectory, "/" SUBDIR_MAPS);	// source dir
+	strcat (path_mapdirectory, SUBDIR_MAPS);	// source dir
 
 	strcpy (path_finalmapdir, s);
-	strcat (path_finalmapdir, "/" SUBDIR_MAPS);	// dest dir
+	strcat (path_finalmapdir, SUBDIR_MAPS);	// dest dir
 
 	[basepathinfo_i setStringValue: [NSString stringWithCString:s]];
 										// in Project Inspector
@@ -165,6 +168,7 @@ id          project_i;
 -initProject
 {
 	[self parseProjectFile];
+	Sys_Printf ("%p\n", projectInfo);
 	if (projectInfo == NULL)
 		return self;
 	[self initVars];
@@ -331,7 +335,7 @@ t           in:(id) obj
 {
 	FILE       *fp;
 	struct stat s;
-
+Sys_Printf ("openProjectFile: %s\n", path);
 	strcpy (path_projectinfo, path);
 
 	projectInfo = NULL;
@@ -372,6 +376,7 @@ t           in:(id) obj
 	if (rtn == NSOKButton) {
 		filenames =[openpanel filenames];
 		dir =[[openpanel directory] cString];
+		dir = "";
 		sprintf (path, "%s/%s", dir,[[filenames objectAtIndex:0] cString]);
 		strcpy (path_projectinfo, path);
 		[self openProjectFile:path];
diff --git a/tools/Forge/Bundles/MapEdit/SetBrush.m b/tools/Forge/Bundles/MapEdit/SetBrush.m
index be78ac854..99fe3801e 100644
--- a/tools/Forge/Bundles/MapEdit/SetBrush.m
+++ b/tools/Forge/Bundles/MapEdit/SetBrush.m
@@ -622,80 +622,79 @@ initOwner: fromTokens
 */
 int         numsb;
 
--initFromScript:(script_t *)
-script      owner:own {
+-initFromScript:(script_t *)script owner:own
+{
 	face_t     *f;
 	int         i, j;
 
 	[self init];
 
-		          parent = own;
+	parent = own;
 
-		          f = faces;
-		          numfaces = 0;
-	do
-{
-if (!Script_GetToken (script, true))
-	break;
-if (!strcmp (Script_Token (script), "}"))
-	break;
+	f = faces;
+	numfaces = 0;
+	do {
+		if (!Script_GetToken (script, true))
+			break;
+		if (!strcmp (Script_Token (script), "}"))
+			break;
 
-for (i = 0; i < 3; i++) {
-	if (i != 0)
-		Script_GetToken (script, true);
-	if (strcmp (Script_Token (script), "("))
-		Sys_Error ("parsing map file");
+		for (i = 0; i < 3; i++) {
+			if (i != 0)
+				Script_GetToken (script, true);
+			if (strcmp (Script_Token (script), "("))
+				Sys_Error ("parsing map file");
+
+			for (j = 0; j < 3; j++) {
+				Script_GetToken (script, false);
+				f->planepts[i][j] = atoi (Script_Token (script));
+			} Script_GetToken (script, false);
+
+			if (strcmp (Script_Token (script), ")"))
+				Sys_Error ("parsing map file");
+		}
 
-	for (j = 0; j < 3; j++) {
 		Script_GetToken (script, false);
-		f->planepts[i][j] = atoi (Script_Token (script));
-	} Script_GetToken (script, false);
-
-	if (strcmp (Script_Token (script), ")"))
-		Sys_Error ("parsing map file");
-}
-
-Script_GetToken (script, false);
-strcpy (f->texture.texture, Script_Token (script));
-Script_GetToken (script, false);
-f->texture.shift[0] = atof (Script_Token (script));
-Script_GetToken (script, false);
-f->texture.shift[1] = atof (Script_Token (script));
-Script_GetToken (script, false);
-f->texture.rotate = atof (Script_Token (script));
-Script_GetToken (script, false);
-f->texture.scale[0] = atof (Script_Token (script));
-Script_GetToken (script, false);
-f->texture.scale[1] = atof (Script_Token (script));
+		strcpy (f->texture.texture, Script_Token (script));
+		Script_GetToken (script, false);
+		f->texture.shift[0] = atof (Script_Token (script));
+		Script_GetToken (script, false);
+		f->texture.shift[1] = atof (Script_Token (script));
+		Script_GetToken (script, false);
+		f->texture.rotate = atof (Script_Token (script));
+		Script_GetToken (script, false);
+		f->texture.scale[0] = atof (Script_Token (script));
+		Script_GetToken (script, false);
+		f->texture.scale[1] = atof (Script_Token (script));
 
 #if 0
-flags = atoi (Script_Token (script));
+		flags = atoi (Script_Token (script));
 
-flags &= 7;
+		flags &= 7;
 
-f->texture.rotate = 0;
-f->texture.scale[0] = 1;
-f->texture.scale[1] = 1;
+		f->texture.rotate = 0;
+		f->texture.scale[0] = 1;
+		f->texture.scale[1] = 1;
 
-#define	TEX_FLIPAXIS	1
-#define	TEX_FLIPS		2
-#define	TEX_FLIPT		4
+		#define	TEX_FLIPAXIS	1
+		#define	TEX_FLIPS		2
+		#define	TEX_FLIPT		4
 
-if (flags & TEX_FLIPAXIS) {
-	f->texture.rotate = 90;
-	if (!(flags & TEX_FLIPT))
-		f->texture.scale[0] = -1;
-	if (flags & TEX_FLIPS)
-		f->texture.scale[1] = -1;
-} else {
-	if (flags & TEX_FLIPS)
-		f->texture.scale[0] = -1;
-	if (flags & TEX_FLIPT)
-		f->texture.scale[1] = -1;
-}
+		if (flags & TEX_FLIPAXIS) {
+			f->texture.rotate = 90;
+			if (!(flags & TEX_FLIPT))
+				f->texture.scale[0] = -1;
+			if (flags & TEX_FLIPS)
+				f->texture.scale[1] = -1;
+		} else {
+			if (flags & TEX_FLIPS)
+				f->texture.scale[0] = -1;
+			if (flags & TEX_FLIPT)
+				f->texture.scale[1] = -1;
+		}
 #endif
-f++;
-numfaces++;
+		f++;
+		numfaces++;
 	} while (1);
 
 	numsb++;
diff --git a/tools/Forge/Bundles/MapEdit/Things.m b/tools/Forge/Bundles/MapEdit/Things.m
index 85703160f..076bb321e 100644
--- a/tools/Forge/Bundles/MapEdit/Things.m
+++ b/tools/Forge/Bundles/MapEdit/Things.m
@@ -1,3 +1,4 @@
+#include "QF/sys.h"
 
 #include "Things.h"
 #include "QuakeEd.h"