From 0f426c1c5ac4e470b4d00050b0a5d82763c81950 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 12 Sep 2010 01:41:18 +0900 Subject: [PATCH] Whitespace. --- tools/Forge/Bundles/MapEdit/CameraView.h | 17 ++--- tools/Forge/Bundles/MapEdit/Dict.h | 41 ++++------- tools/Forge/Bundles/MapEdit/DictList.h | 3 +- tools/Forge/Bundles/MapEdit/Entity.h | 9 +-- tools/Forge/Bundles/MapEdit/EntityClass.h | 6 +- .../Forge/Bundles/MapEdit/InspectorControl.h | 11 ++- tools/Forge/Bundles/MapEdit/KeypairView.h | 4 +- tools/Forge/Bundles/MapEdit/Map.h | 4 +- tools/Forge/Bundles/MapEdit/SetBrush.h | 73 +++++-------------- tools/Forge/Bundles/MapEdit/TexturePalette.h | 3 +- tools/Forge/Bundles/MapEdit/Things.h | 3 +- tools/Forge/Bundles/MapEdit/XYView.h | 8 +- tools/Forge/Bundles/MapEdit/ZScrollView.h | 6 +- tools/Forge/Bundles/MapEdit/ZView.h | 3 +- 14 files changed, 72 insertions(+), 119 deletions(-) diff --git a/tools/Forge/Bundles/MapEdit/CameraView.h b/tools/Forge/Bundles/MapEdit/CameraView.h index e6f1411ea..67de8d874 100644 --- a/tools/Forge/Bundles/MapEdit/CameraView.h +++ b/tools/Forge/Bundles/MapEdit/CameraView.h @@ -44,15 +44,14 @@ extern BOOL timedrawing; -setOrigin:(vec3_t) org -angle:(float) - angle; +angle:(float)angle; --getOrigin:(vec3_t) org; +-getOrigin:(vec3_t)org; -(float) yawAngle; -matrixFromAngles; --_keyDown:(NSEvent *) theEvent; +-_keyDown:(NSEvent *)theEvent; -drawMode:sender; -setDrawMode:(drawmode_t) mode; @@ -61,15 +60,9 @@ angle:(float) -XYDrawSelf; // for drawing viewpoint in XY view -ZDrawSelf; // for drawing viewpoint in XY view --(BOOL) XYmouseDown:(NSPoint *) -pt -flags:(int) - flags; // return YES if brush handled +-(BOOL) XYmouseDown:(NSPoint *)pt flags:(int)flags;// return YES if brush handled --(BOOL) ZmouseDown:(NSPoint *) -pt -flags:(int) - flags; // return YES if brush handled +-(BOOL) ZmouseDown:(NSPoint *)pt flags:(int)flags;// return YES if brush handled -upFloor:sender; -downFloor:sender; diff --git a/tools/Forge/Bundles/MapEdit/Dict.h b/tools/Forge/Bundles/MapEdit/Dict.h index 8ee8be6ec..5d1cb37e7 100644 --- a/tools/Forge/Bundles/MapEdit/Dict.h +++ b/tools/Forge/Bundles/MapEdit/Dict.h @@ -10,25 +10,23 @@ typedef struct { char *value; } dict_t; -@interface Dict:Storage { +@interface Dict:Storage +{ } -initFromFile:(FILE *) fp; -(id) parseMultipleFrom:(char *) value; -(int) getValueUnits:(char *) key; --delString:(char *) -string fromValue:(char *) key; +-delString:(char *)string fromValue:(char *) key; --addString:(char *) -string toValue:(char *) key; +-addString:(char *)string toValue:(char *) key; -(char *) convertListToString:(id) list; -(char *) getStringFor:(char *) name; -removeKeyword:(char *) key; -(unsigned int) getValueFor:(char *) name; --changeStringFor:(char *) -key to:(char *) value; +-changeStringFor:(char *)key to:(char *) value; -(dict_t *) findKeyword:(char *) key; @@ -41,24 +39,17 @@ key to:(char *) value; -setupMultiple:(char *) value; -(char *) getNextParameter; -@end int -GetNextChar (FILE * fp); -void -CopyUntilWhitespc (FILE * fp, char *buffer); -void -CopyUntilQuote (FILE * fp, char *buffer); -int -FindBrace (FILE * fp); -int -FindQuote (FILE * fp); -int -FindWhitespc (FILE * fp); -int -FindNonwhitespc (FILE * fp); +@end -char * -FindWhitespcInBuffer (char *buffer); -char * -FindNonwhitespcInBuffer (char *buffer); +int GetNextChar (FILE * fp); +void CopyUntilWhitespc (FILE * fp, char *buffer); +void CopyUntilQuote (FILE * fp, char *buffer); +int FindBrace (FILE * fp); +int FindQuote (FILE * fp); +int FindWhitespc (FILE * fp); +int FindNonwhitespc (FILE * fp); + +char *FindWhitespcInBuffer (char *buffer); +char *FindNonwhitespcInBuffer (char *buffer); #endif // Dict_h diff --git a/tools/Forge/Bundles/MapEdit/DictList.h b/tools/Forge/Bundles/MapEdit/DictList.h index ddd1ab215..b1d15a86d 100644 --- a/tools/Forge/Bundles/MapEdit/DictList.h +++ b/tools/Forge/Bundles/MapEdit/DictList.h @@ -3,7 +3,8 @@ #include -@ interface DictList:NSMutableArray { +@ interface DictList:NSMutableArray +{ } -initListFromFile:(FILE *) fp; diff --git a/tools/Forge/Bundles/MapEdit/Entity.h b/tools/Forge/Bundles/MapEdit/Entity.h index fd9562aa4..bd0b7b3b0 100644 --- a/tools/Forge/Bundles/MapEdit/Entity.h +++ b/tools/Forge/Bundles/MapEdit/Entity.h @@ -13,7 +13,8 @@ typedef struct epair_s { // an Entity is a list of brush objects, with additional key / value info -@interface Entity:NSMutableArray { +@interface Entity:NSMutableArray +{ epair_t *epairs; BOOL modifiable; } @@ -28,12 +29,10 @@ typedef struct epair_s { -(char *) targetname; --writeToFILE:(FILE *) -f region:(BOOL) reg; +-writeToFILE:(FILE *)f region:(BOOL) reg; -(char *) valueForQKey:(char *) k; --getVector:(vec3_t) -v forKey:(char *) k; +-getVector:(vec3_t)v forKey:(char *) k; -setKey:(const char *) k toValue:(const char *) v; diff --git a/tools/Forge/Bundles/MapEdit/EntityClass.h b/tools/Forge/Bundles/MapEdit/EntityClass.h index aa7250925..9232798db 100644 --- a/tools/Forge/Bundles/MapEdit/EntityClass.h +++ b/tools/Forge/Bundles/MapEdit/EntityClass.h @@ -9,7 +9,8 @@ typedef enum { esize_model, esize_fixed } esize_t; #define MAX_FLAGS 8 -@interface EntityClass:NSObject { +@interface EntityClass:NSObject +{ char *name; esize_t esize; vec3_t mins, maxs; @@ -18,8 +19,7 @@ typedef enum { esize_model, esize_fixed } esize_t; char *flagnames[MAX_FLAGS]; } --initFromText:(const char *) -text source:(const char *) filename; +-initFromText:(const char *)text source:(const char *) filename; -(char *) classname; -(esize_t) esize; diff --git a/tools/Forge/Bundles/MapEdit/InspectorControl.h b/tools/Forge/Bundles/MapEdit/InspectorControl.h index 6b562af9c..3db0e9689 100644 --- a/tools/Forge/Bundles/MapEdit/InspectorControl.h +++ b/tools/Forge/Bundles/MapEdit/InspectorControl.h @@ -24,11 +24,10 @@ extern id inspcontrol_i; // (gets replaced) id contentList; // List of contentviews (corresponds to + // insp_e enum order) - // insp_e enum order) id windowList; // List of Windows (corresponds to - - // insp_e enum order) + // insp_e enum order) id obj_textures_i; // TexturePalette object (for // delegating) @@ -69,6 +68,10 @@ extern id inspcontrol_i; -changeInspectorTo:(insp_e) which; -(insp_e) getCurrentInspector; -@end @ protocol InspectorControl - windowResized; @end + +@protocol InspectorControl +-windowResized; +@end + #endif // InspectorControl_h diff --git a/tools/Forge/Bundles/MapEdit/KeypairView.h b/tools/Forge/Bundles/MapEdit/KeypairView.h index 01ac3c0b5..7560aa2e7 100644 --- a/tools/Forge/Bundles/MapEdit/KeypairView.h +++ b/tools/Forge/Bundles/MapEdit/KeypairView.h @@ -5,7 +5,8 @@ extern id keypairview_i; -@interface KeypairView:NSView { +@interface KeypairView:NSView +{ } -calcViewSize; @@ -17,4 +18,5 @@ extern id keypairview_i; #define LINEHEIGHT 16 @end + #endif // KeypairView_h diff --git a/tools/Forge/Bundles/MapEdit/Map.h b/tools/Forge/Bundles/MapEdit/Map.h index 7e03f9038..cfcb9cd9e 100644 --- a/tools/Forge/Bundles/MapEdit/Map.h +++ b/tools/Forge/Bundles/MapEdit/Map.h @@ -20,8 +20,7 @@ extern id map_i; -writeStats; -readMapFile:(char *) fname; --writeMapFile:(char *) -fname useRegion:(BOOL) reg; +-writeMapFile:(char *)fname useRegion:(BOOL) reg; -entityConnect: (vec3_t) p1:(vec3_t) p2; @@ -72,4 +71,5 @@ fname useRegion:(BOOL) reg; -selectCompleteEntity:sender; @end + #endif // Map_h diff --git a/tools/Forge/Bundles/MapEdit/SetBrush.h b/tools/Forge/Bundles/MapEdit/SetBrush.h index 3d6dadd79..3ac684157 100644 --- a/tools/Forge/Bundles/MapEdit/SetBrush.h +++ b/tools/Forge/Bundles/MapEdit/SetBrush.h @@ -60,22 +60,12 @@ winding_t *NewWinding (int points); face_t faces[MAX_FACES]; } --initOwner: own mins:(float *) -mins -maxs:(float *) -maxs -texture:(texturedef_t *) - tex; +-initOwner:own mins:(float *)mins maxs:(float *)maxs + texture:(texturedef_t *)tex; --initFromScript:(struct script_s *) -script - owner: - own; +-initFromScript:(struct script_s *)script owner:own; --setMins:(float *) -mins -maxs:(float *) - maxs; +-setMins:(float *)mins maxs:(float *)maxs; -parent; -setParent:(id) p; @@ -84,39 +74,28 @@ maxs:(float *) -calcWindings; --writeToFILE:(FILE *) -f -region:(BOOL) - reg; +-writeToFILE:(FILE *)f region:(BOOL)reg; -(BOOL) selected; -(BOOL) regioned; -setSelected:(BOOL) s; -setRegioned:(BOOL) s; --getMins:(vec3_t) -mins -maxs:(vec3_t) - maxs; +-getMins:(vec3_t)mins maxs:(vec3_t)maxs; -(BOOL) containsPoint:(vec3_t) pt; -freeWindings; -removeIfInvalid; -extern vec3_t - region_min, - region_max; +extern vec3_t region_min, region_max; -newRegion; -(texturedef_t *) texturedef; -(texturedef_t *) texturedefForFace:(int) f; -setTexturedef:(texturedef_t *) tex; --setTexturedef:(texturedef_t *) -tex -forFace:(int) - f; +-setTexturedef:(texturedef_t *) tex forFace:(int) f; -XYDrawSelf; -ZDrawSelf; @@ -129,10 +108,8 @@ forFace:(int) // // single brush actions // -extern int - numcontrolpoints; -extern float * - controlpoints[MAX_FACES * 3]; +extern int numcontrolpoints; +extern float *controlpoints[MAX_FACES * 3]; -getZdragface:(vec3_t) dragpoint; -getXYdragface:(vec3_t) dragpoint; @@ -145,32 +122,23 @@ extern float * // -carveByClipper; -extern vec3_t - sb_translate; +extern vec3_t sb_translate; -translate; -extern id - carve_in, - carve_out; +extern id carve_in, carve_out; -select; -deselect; -remove; -flushTextures; -extern vec3_t - sb_mins, - sb_maxs; +extern vec3_t sb_mins, sb_maxs; -addToBBox; -extern vec3_t - sel_x, - sel_y, - sel_z; -extern vec3_t - sel_org; +extern vec3_t sel_x, sel_y, sel_z; +extern vec3_t sel_org; -transform; @@ -179,25 +147,20 @@ extern vec3_t -carve; -setCarveVars; -extern id - sb_newowner; +extern id sb_newowner; -moveToEntity; -takeCurrentTexture; -extern vec3_t - select_min, - select_max; +extern vec3_t select_min, select_max; -selectPartial; -selectComplete; -regionPartial; -regionComplete; -extern float - sb_floor_dir, - sb_floor_dist; +extern float sb_floor_dir, sb_floor_dist; -feetToFloor; diff --git a/tools/Forge/Bundles/MapEdit/TexturePalette.h b/tools/Forge/Bundles/MapEdit/TexturePalette.h index 0869b9c6c..8c88f4281 100644 --- a/tools/Forge/Bundles/MapEdit/TexturePalette.h +++ b/tools/Forge/Bundles/MapEdit/TexturePalette.h @@ -51,7 +51,8 @@ typedef struct { extern id texturepalette_i; -@interface TexturePalette:NSObject { +@interface TexturePalette:NSObject +{ char currentwad[1024]; id textureList_i; id textureView_i; diff --git a/tools/Forge/Bundles/MapEdit/Things.h b/tools/Forge/Bundles/MapEdit/Things.h index e08de7bbe..a517fb4ad 100644 --- a/tools/Forge/Bundles/MapEdit/Things.h +++ b/tools/Forge/Bundles/MapEdit/Things.h @@ -9,7 +9,8 @@ extern id things_i; #define ENTITYNAMEKEY "spawn" -@interface Things:NSObject { +@interface Things:NSObject +{ id entity_browser_i; // browser id entity_comment_i; // scrolling text window diff --git a/tools/Forge/Bundles/MapEdit/XYView.h b/tools/Forge/Bundles/MapEdit/XYView.h index e5f66c97a..c9d4862d7 100644 --- a/tools/Forge/Bundles/MapEdit/XYView.h +++ b/tools/Forge/Bundles/MapEdit/XYView.h @@ -29,7 +29,8 @@ void XYlineto (vec3_t pt); -@interface XYView:NSView { +@interface XYView:NSView +{ NSRect realbounds, newrect, combinedrect; NSPoint midpoint; int gridsize; @@ -57,10 +58,7 @@ void XYlineto (vec3_t pt); -newRealBounds:(NSRect *) nb; -addToScrollRange: (float) x:(float) y; --setOrigin:(NSPoint *) -pt -scale:(float) - sc; +-setOrigin:(NSPoint *) pt scale:(float) sc; -centerOn:(vec3_t) org; diff --git a/tools/Forge/Bundles/MapEdit/ZScrollView.h b/tools/Forge/Bundles/MapEdit/ZScrollView.h index 85a19be58..b88efa071 100644 --- a/tools/Forge/Bundles/MapEdit/ZScrollView.h +++ b/tools/Forge/Bundles/MapEdit/ZScrollView.h @@ -3,12 +3,12 @@ #include -@ interface ZScrollView:NSScrollView { +@interface ZScrollView:NSScrollView +{ id button1; } --initWithFrame:(NSRect) -frameRect button1:b1; +-initWithFrame:(NSRect) frameRect button1:b1; -tile; diff --git a/tools/Forge/Bundles/MapEdit/ZView.h b/tools/Forge/Bundles/MapEdit/ZView.h index ebf632aff..7f5ce8a82 100644 --- a/tools/Forge/Bundles/MapEdit/ZView.h +++ b/tools/Forge/Bundles/MapEdit/ZView.h @@ -13,7 +13,8 @@ extern id zview_i; extern float zplane; extern float zplanedir; -@interface ZView:NSView { +@interface ZView:NSView +{ float minheight, maxheight; float oldminheight, oldmaxheight; float topbound, bottombound; // for floor clipping