diff --git a/tools/Forge/help.txt b/tools/Forge/Documentation/help.txt similarity index 100% rename from tools/Forge/help.txt rename to tools/Forge/Documentation/help.txt diff --git a/tools/Forge/English.lproj/Forge.gorm b/tools/Forge/English.lproj/Forge.gorm new file mode 100644 index 000000000..9db2c8d64 Binary files /dev/null and b/tools/Forge/English.lproj/Forge.gorm differ diff --git a/tools/Forge/Forge.h b/tools/Forge/Forge.h index 11d8df62d..59c400993 100644 --- a/tools/Forge/Forge.h +++ b/tools/Forge/Forge.h @@ -1,10 +1,10 @@ -extern id quakeed_i; +extern id quakeed_i; -extern BOOL filter_light, filter_path, filter_entities; -extern BOOL filter_clip_brushes, filter_water_brushes, filter_world; +extern BOOL filter_light, filter_path, filter_entities; +extern BOOL filter_clip_brushes, filter_water_brushes, filter_world; -extern UserPath *upath; +extern UserPath *upath; extern id g_cmd_out_i; @@ -14,7 +14,7 @@ void NopSound (void); void qprintf (char *fmt, ...); // prints text to cmd_out_i -@interface QuakeEd: NSWindow +@interface Forge: NSWindow { BOOL dirty; char filename[1024]; // full path with .map extension diff --git a/tools/Forge/Forge.m b/tools/Forge/Forge.m index f8037d17d..77aa94337 100644 --- a/tools/Forge/Forge.m +++ b/tools/Forge/Forge.m @@ -1,6 +1,10 @@ - #import "qedefs.h" +#import +#import + +#import "Forge.h" + id quakeed_i; id entclasses_i; @@ -26,7 +30,7 @@ char *leakcmd = "rsh satan \"/LocalApps/qbsp -mark -notjunc $1 $2\""; void NopSound (void) { - NXBeep (); + NSBeep (); } UserPath *upath; @@ -71,7 +75,7 @@ void DisplayCmdOutput (void) [preferences_i playBspSound]; - NXPing (); + NSPing (); } /* @@ -96,7 +100,7 @@ void CheckCmdDone(DPSTimedEntry tag, double now, void *userData) //============================================================================ -@implementation QuakeEd +@implementation Forge /* =============== diff --git a/tools/Forge/ForgeInfo.plist b/tools/Forge/ForgeInfo.plist new file mode 100644 index 000000000..97ef3bf40 --- /dev/null +++ b/tools/Forge/ForgeInfo.plist @@ -0,0 +1,12 @@ +{ + ApplicationDescription = "A map editor for QuakeForge"; + ApplicationIcon = "Images/Forge.tiff"; + ApplicationName = Forge; + ApplicationRelease = 0.1; + Authors = "Jeff Teunissen and Bill Currie"; + Copyright = "Copyright (C) 2001 Jeff Teunissen , Bill Currie "; + CopyrightDescription = "Released under the GNU General Public License"; + FullVersionID = 0.1; + NOTE = "Automatically generated!"; + URL = ""; +} diff --git a/tools/Forge/GNUmakefile b/tools/Forge/GNUmakefile index f2c348cce..cb8b8c859 100644 --- a/tools/Forge/GNUmakefile +++ b/tools/Forge/GNUmakefile @@ -1,52 +1,126 @@ +# +# GNUmakefile - Generated by the ProjectCenter +# Written by Philippe C.D. Robert +# +# NOTE: Do NOT change this file -- ProjectCenter maintains it! +# +# Put all of your customisations in GNUmakefile.preamble and +# GNUmakefile.postamble +# + include $(GNUSTEP_MAKEFILES)/common.make +# -OBJCFLAGS += -Wall - -PACKAGE_NAME= Forge -APP_NAME= Forge -Forge_APPLICATION_ICON= Forge.tiff +# Subprojects +# # +# Main application +# + +PACKAGE_NAME=Forge +APP_NAME=Forge +Forge_APPLICATION_ICON=Images/Forge.tiff +# + +# Additional libraries +# + +ADDITIONAL_GUI_LIBS += + +# + # Resource files # -Forge_LANGUAGES= English -# We don't have a .gorm file yet, but we will -Forge_LOCALIZED_RESOURCE_FILES= Forge.gorm -Forge_RESOURCE_FILES= DownArrow.tiff i_90d.tiff i_add.tiff i_brushes.tiff \ - i_fliph.tiff i_flipv.tiff i_sub.tiff short.tiff \ - tall.tiff UpArrow.tiff + +Forge_RESOURCE_FILES= \ +English.lproj/Forge.gorm \ +ForgeInfo.plist \ +Images/DownArrow.tiff \ +Images/Forge.tiff \ +Images/UpArrow.tiff \ +Images/i_90d.tiff \ +Images/i_add.tiff \ +Images/i_brushes.tiff \ +Images/i_fliph.tiff \ +Images/i_flipv.tiff \ +Images/i_quakeed.tiff \ +Images/i_sub.tiff \ +Images/inspectors.tiff \ +Images/mainwindow.tiff \ +Images/short.tiff \ +Images/tall.tiff # + # Header files # -Forge_HEADERS= CameraView.h Clipper.h Entity.h EntityArray.h EntityClass.h \ - Forge.h InspectorControl.h KeypairView.h Map.h PopScrollView.h \ - Preferences.h Project.h SetBrush.h TexturePalette.h \ - TextureView.h Things.h UserPath.h XYView.h ZScrollView.h \ - ZView.h \ - render.h cmdlib.h mathlib.h + +Forge_HEADERS= \ +CameraView.h \ +Clipper.h \ +Entity.h \ +EntityArray.h \ +EntityClass.h \ +Forge.h \ +InspectorControl.h \ +KeypairView.h \ +Map.h \ +PopScrollView.h \ +Preferences.h \ +Project.h \ +SetBrush.h \ +TexturePalette.h \ +TextureView.h \ +Things.h \ +UserPath.h \ +XYView.h \ +ZScrollView.h \ +ZView.h \ +cmdlib.h \ +mathlib.h \ +qedefs.h \ +render.h # + # Class files # -Forge_OBJC_FILES= CameraView.m Clipper.m Entity.m EntityArray.m \ - EntityClass.m Forge.m Forge_main.m InspectorControl.m \ - KeypairView.m Map.m PopScrollView.m Preferences.m \ - Project.m SetBrush.m TexturePalette.m TextureView.m \ - Things.m UserPath.m XYView.m ZScrollView.m ZView.m \ - misc.m render.m + +Forge_OBJC_FILES= \ +CameraView.m \ +Clipper.m \ +Entity.m \ +EntityArray.m \ +EntityClass.m \ +Forge.m \ +Forge_main.m \ +InspectorControl.m \ +KeypairView.m \ +Map.m \ +PopScrollView.m \ +Preferences.m \ +Project.m \ +SetBrush.m \ +TexturePalette.m \ +TextureView.m \ +Things.m \ +UserPath.m \ +XYView.m \ +ZScrollView.m \ +ZView.m # + # C files # -Forge_C_FILES= cmdlib.c mathlib.c -Forge_OTHER_SOURCES= GNUmakefile +Forge_C_FILES= \ +cmdlib.c \ +mathlib.c -include GNUmakefile.preamble - +-include GNUmakefile.local +include $(GNUSTEP_MAKEFILES)/aggregate.make include $(GNUSTEP_MAKEFILES)/application.make - -include GNUmakefile.postamble - --include GNUmakefile.dependencies diff --git a/tools/Forge/DownArrow.tiff b/tools/Forge/Images/DownArrow.tiff similarity index 100% rename from tools/Forge/DownArrow.tiff rename to tools/Forge/Images/DownArrow.tiff diff --git a/tools/Forge/Forge.tiff b/tools/Forge/Images/Forge.tiff similarity index 100% rename from tools/Forge/Forge.tiff rename to tools/Forge/Images/Forge.tiff diff --git a/tools/Forge/UpArrow.tiff b/tools/Forge/Images/UpArrow.tiff similarity index 100% rename from tools/Forge/UpArrow.tiff rename to tools/Forge/Images/UpArrow.tiff diff --git a/tools/Forge/i_90d.tiff b/tools/Forge/Images/i_90d.tiff similarity index 100% rename from tools/Forge/i_90d.tiff rename to tools/Forge/Images/i_90d.tiff diff --git a/tools/Forge/i_add.tiff b/tools/Forge/Images/i_add.tiff similarity index 100% rename from tools/Forge/i_add.tiff rename to tools/Forge/Images/i_add.tiff diff --git a/tools/Forge/i_brushes.tiff b/tools/Forge/Images/i_brushes.tiff similarity index 100% rename from tools/Forge/i_brushes.tiff rename to tools/Forge/Images/i_brushes.tiff diff --git a/tools/Forge/i_fliph.tiff b/tools/Forge/Images/i_fliph.tiff similarity index 100% rename from tools/Forge/i_fliph.tiff rename to tools/Forge/Images/i_fliph.tiff diff --git a/tools/Forge/i_flipv.tiff b/tools/Forge/Images/i_flipv.tiff similarity index 100% rename from tools/Forge/i_flipv.tiff rename to tools/Forge/Images/i_flipv.tiff diff --git a/tools/Forge/i_quakeed.tiff b/tools/Forge/Images/i_quakeed.tiff similarity index 100% rename from tools/Forge/i_quakeed.tiff rename to tools/Forge/Images/i_quakeed.tiff diff --git a/tools/Forge/i_sub.tiff b/tools/Forge/Images/i_sub.tiff similarity index 100% rename from tools/Forge/i_sub.tiff rename to tools/Forge/Images/i_sub.tiff diff --git a/tools/Forge/inspectors.tiff b/tools/Forge/Images/inspectors.tiff similarity index 100% rename from tools/Forge/inspectors.tiff rename to tools/Forge/Images/inspectors.tiff diff --git a/tools/Forge/mainwindow.tiff b/tools/Forge/Images/mainwindow.tiff similarity index 100% rename from tools/Forge/mainwindow.tiff rename to tools/Forge/Images/mainwindow.tiff diff --git a/tools/Forge/short.tiff b/tools/Forge/Images/short.tiff similarity index 100% rename from tools/Forge/short.tiff rename to tools/Forge/Images/short.tiff diff --git a/tools/Forge/tall.tiff b/tools/Forge/Images/tall.tiff similarity index 100% rename from tools/Forge/tall.tiff rename to tools/Forge/Images/tall.tiff diff --git a/tools/Forge/PC.project b/tools/Forge/PC.project new file mode 100644 index 000000000..06a2802a2 --- /dev/null +++ b/tools/Forge/PC.project @@ -0,0 +1,115 @@ +{ + APPCLASS = NSApplication; + APPKIT = "GNUSTEP-GUI"; + APPLICATIONICON = Images/Forge.tiff; + BUILDTOOL = gnumake; + CLASS_FILES = ( + CameraView.m, + Clipper.m, + Entity.m, + EntityArray.m, + EntityClass.m, + Forge.m, + Forge_main.m, + InspectorControl.m, + KeypairView.m, + Map.m, + PopScrollView.m, + Preferences.m, + Project.m, + SetBrush.m, + TexturePalette.m, + TextureView.m, + Things.m, + UserPath.m, + XYView.m, + ZScrollView.m, + ZView.m + ); + COMPILEROPTIONS = ""; + CREATION_DATE = ""; + DOCU_FILES = ( + Documentation/help.txt + ); + FOUNDATION = "GNUSTEP-BASE"; + FRAMEWORKS = ( + ); + HEADER_FILES = ( + CameraView.h, + Clipper.h, + Entity.h, + EntityArray.h, + EntityClass.h, + Forge.h, + InspectorControl.h, + KeypairView.h, + Map.h, + PopScrollView.h, + Preferences.h, + Project.h, + SetBrush.h, + TexturePalette.h, + TextureView.h, + Things.h, + UserPath.h, + XYView.h, + ZScrollView.h, + ZView.h, + cmdlib.h, + mathlib.h, + qedefs.h, + render.h + ); + IMAGES = ( + Images/DownArrow.tiff, + Images/Forge.tiff, + Images/UpArrow.tiff, + Images/i_90d.tiff, + Images/i_add.tiff, + Images/i_brushes.tiff, + Images/i_fliph.tiff, + Images/i_flipv.tiff, + Images/i_quakeed.tiff, + Images/i_sub.tiff, + Images/inspectors.tiff, + Images/mainwindow.tiff, + Images/short.tiff, + Images/tall.tiff + ); + INSTALLDIR = "$(HOME)/Apps"; + INTERFACES = ( + English.lproj/Forge.gorm + ); + LANGUAGE = English; + LAST_EDITING = ""; + LIBRARIES = ( + "gnustep-base", + "gnustep-gui" + ); + MAININTERFACE = ""; + MAKEFILEDIR = /System/Makefiles; + OTHER_FILES = ( + ); + OTHER_RESOURCES = ( + ForgeInfo.plist + ); + OTHER_SOURCES = ( + cmdlib.c, + mathlib.c + ); + PRINCIPAL_CLASS = Forge_main.m; + PROJECT_BUILDER = PCAppProj; + PROJECT_CREATOR = "Jeff Teunissen "; + PROJECT_DESCRIPTION = "QuakeForge Map Editor"; + PROJECT_MAINTAINER = "Jeff Teunissen , Bill Currie "; + PROJECT_NAME = Forge; + PROJECT_TYPE = PCAppProject; + PROJECT_VERSION = 1.0; + SUBPROJECTS = ( + ); + SUPPORTING_FILES = ( + GNUmakefile.preamble, + GNUmakefile, + GNUmakefile.postamble + ); +}