mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-05-30 00:10:40 +00:00
Pass .m files through indent.
The result isn't perfect, but it cleans up the whitespace and makes the code more consistent with the rest of the project.
This commit is contained in:
Bill Currie
parent
d3a12ee727
commit
d23300d58b
25 changed files with 5481 additions and 5886 deletions
|
|
@ -12,89 +12,85 @@
|
|||
|
||||
@implementation Entity
|
||||
|
||||
vec3_t bad_mins = {-8, -8, -8};
|
||||
vec3_t bad_maxs = {8, 8, 8};
|
||||
vec3_t bad_mins = { -8, -8, -8 };
|
||||
vec3_t bad_maxs = { 8, 8, 8 };
|
||||
|
||||
- createFixedBrush: (vec3_t)org
|
||||
-createFixedBrush:(vec3_t) org
|
||||
{
|
||||
vec3_t emins, emaxs;
|
||||
float *v, *v2, *color;
|
||||
id new;
|
||||
texturedef_t td;
|
||||
|
||||
vec3_t emins, emaxs;
|
||||
float *v, *v2, *color;
|
||||
id new;
|
||||
texturedef_t td;
|
||||
|
||||
// get class
|
||||
new = [entity_classes_i classForName: [self valueForQKey: "classname"]];
|
||||
new =[entity_classes_i classForName: [self valueForQKey:"classname"]];
|
||||
if (new) {
|
||||
v = [new mins];
|
||||
v2 = [new maxs];
|
||||
v =[new mins];
|
||||
v2 =[new maxs];
|
||||
} else {
|
||||
v = bad_mins;
|
||||
v2 = bad_maxs;
|
||||
}
|
||||
|
||||
color = [new drawColor];
|
||||
color =[new drawColor];
|
||||
|
||||
modifiable = NO;
|
||||
memset(&td,0,sizeof(td));
|
||||
strcpy (td.texture,"entity");
|
||||
memset (&td, 0, sizeof (td));
|
||||
strcpy (td.texture, "entity");
|
||||
|
||||
VectorAdd (org, v, emins);
|
||||
VectorAdd (org, v2, emaxs);
|
||||
new = [[SetBrush alloc] initOwner: self mins:emins maxs:emaxs
|
||||
texture: &td];
|
||||
[new setEntityColor: color];
|
||||
new =[[SetBrush alloc] initOwner: self mins: emins maxs: emaxs texture:&td];
|
||||
[new setEntityColor:color];
|
||||
|
||||
[self addObject:new];
|
||||
|
||||
[self addObject: new];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- initClass: (char *)classname
|
||||
-initClass:(char *) classname
|
||||
{
|
||||
id new;
|
||||
esize_t esize;
|
||||
char value[80];
|
||||
vec3_t min, max;
|
||||
float *v;
|
||||
|
||||
id new;
|
||||
esize_t esize;
|
||||
char value[80];
|
||||
vec3_t min, max;
|
||||
float *v;
|
||||
|
||||
[super init];
|
||||
|
||||
|
||||
modifiable = YES;
|
||||
|
||||
[self setKey: "classname" toValue:classname];
|
||||
|
||||
// get class
|
||||
new = [entity_classes_i classForName: [self valueForQKey: "classname"]];
|
||||
new =[entity_classes_i classForName: [self valueForQKey:"classname"]];
|
||||
if (!new)
|
||||
esize = esize_model;
|
||||
else
|
||||
esize = [new esize];
|
||||
|
||||
// create a brush if needed
|
||||
if (esize == esize_fixed)
|
||||
{
|
||||
v = [new mins];
|
||||
[[map_i selectedBrush] getMins: min maxs: max];
|
||||
VectorSubtract (min, v, min);
|
||||
|
||||
sprintf (value, "%i %i %i",(int)min[0], (int)min[1], (int)min[2]);
|
||||
[self setKey:"origin" toValue: value];
|
||||
esize =[new esize];
|
||||
|
||||
[self createFixedBrush: min];
|
||||
}
|
||||
else
|
||||
// create a brush if needed
|
||||
if (esize == esize_fixed) {
|
||||
v =[new mins];
|
||||
[[map_i selectedBrush] getMins: min maxs:max];
|
||||
VectorSubtract (min, v, min);
|
||||
|
||||
sprintf (value, "%i %i %i", (int) min[0], (int) min[1], (int) min[2]);
|
||||
[self setKey: "origin" toValue:value];
|
||||
|
||||
[self createFixedBrush:min];
|
||||
} else
|
||||
modifiable = YES;
|
||||
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
|
||||
- (void)dealloc
|
||||
-(void) dealloc
|
||||
{
|
||||
epair_t *e, *n;
|
||||
|
||||
for (e=epairs ; e ; e=n)
|
||||
{
|
||||
epair_t *e, *n;
|
||||
|
||||
for (e = epairs; e; e = n) {
|
||||
n = e->next;
|
||||
free (e->key);
|
||||
free (e->value);
|
||||
|
|
@ -103,78 +99,79 @@ vec3_t bad_maxs = {8, 8, 8};
|
|||
[super dealloc];
|
||||
}
|
||||
|
||||
- (BOOL)modifiable
|
||||
-(BOOL) modifiable
|
||||
{
|
||||
return modifiable;
|
||||
}
|
||||
|
||||
- setModifiable: (BOOL)m
|
||||
-setModifiable:(BOOL) m
|
||||
{
|
||||
modifiable = m;
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)removeObject: o
|
||||
-(void) removeObject:o
|
||||
{
|
||||
[super removeObject: o];
|
||||
[super removeObject:o];
|
||||
if ([self count])
|
||||
return;
|
||||
// the entity is empty, so remove the entire thing
|
||||
if ( self == [map_i objectAtIndex: 0])
|
||||
return; // never remove the world
|
||||
|
||||
[map_i removeObject: self];
|
||||
if (self ==[map_i objectAtIndex:0])
|
||||
return; // never remove the world
|
||||
|
||||
[map_i removeObject:self];
|
||||
[self release];
|
||||
}
|
||||
|
||||
|
||||
- (char *)valueForQKey: (char *)k
|
||||
-(char *) valueForQKey:(char *) k
|
||||
{
|
||||
epair_t *e;
|
||||
static char ret[64];
|
||||
|
||||
for (e=epairs ; e ; e=e->next)
|
||||
if (!strcmp(k,e->key))
|
||||
{
|
||||
epair_t *e;
|
||||
static char ret[64];
|
||||
|
||||
for (e = epairs; e; e = e->next)
|
||||
if (!strcmp (k, e->key)) {
|
||||
strcpy (ret, e->value);
|
||||
return ret;
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
- getVector: (vec3_t)v forKey: (char *)k
|
||||
-getVector:(vec3_t)
|
||||
v forKey:(char *) k
|
||||
{
|
||||
char *c;
|
||||
|
||||
c = [self valueForQKey: k];
|
||||
char *c;
|
||||
|
||||
c =[self valueForQKey:k];
|
||||
|
||||
v[0] = v[1] = v[2] = 0;
|
||||
|
||||
|
||||
sscanf (c, "%f %f %f", &v[0], &v[1], &v[2]);
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- print
|
||||
-print
|
||||
{
|
||||
epair_t *e;
|
||||
|
||||
for (e=epairs ; e ; e=e->next)
|
||||
printf ("%20s : %20s\n",e->key, e->value);
|
||||
epair_t *e;
|
||||
|
||||
for (e = epairs; e; e = e->next)
|
||||
printf ("%20s : %20s\n", e->key, e->value);
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- setKey:(const char *)k toValue:(const char *)v
|
||||
-setKey:(const char *)
|
||||
k toValue:(const char *) v
|
||||
{
|
||||
epair_t *e;
|
||||
epair_t *e;
|
||||
|
||||
while (*k && *k <= ' ')
|
||||
k++;
|
||||
if (!*k)
|
||||
return self; // don't set NULL values
|
||||
|
||||
for (e=epairs ; e ; e=e->next) {
|
||||
return self; // don't set NULL values
|
||||
|
||||
for (e = epairs; e; e = e->next) {
|
||||
if (!strcmp (k, e->key)) {
|
||||
free (e->value);
|
||||
e->value = strdup (v);
|
||||
|
|
@ -182,59 +179,56 @@ vec3_t bad_maxs = {8, 8, 8};
|
|||
}
|
||||
}
|
||||
|
||||
e = malloc (sizeof(epair_t));
|
||||
e = malloc (sizeof (epair_t));
|
||||
|
||||
e->key = strdup (k);
|
||||
e->value = strdup (v);
|
||||
e->next = epairs;
|
||||
epairs = e;
|
||||
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (int)numPairs
|
||||
-(int) numPairs
|
||||
{
|
||||
int i;
|
||||
epair_t *e;
|
||||
|
||||
i=0;
|
||||
for (e=epairs ; e ; e=e->next)
|
||||
int i;
|
||||
epair_t *e;
|
||||
|
||||
i = 0;
|
||||
for (e = epairs; e; e = e->next)
|
||||
i++;
|
||||
return i;
|
||||
}
|
||||
|
||||
- (epair_t *)epairs
|
||||
-(epair_t *) epairs
|
||||
{
|
||||
return epairs;
|
||||
}
|
||||
|
||||
- removeKeyPair: (char *)key
|
||||
-removeKeyPair:(char *) key
|
||||
{
|
||||
epair_t *e, *e2;
|
||||
|
||||
epair_t *e, *e2;
|
||||
|
||||
if (!epairs)
|
||||
return self;
|
||||
e = epairs;
|
||||
if (!strcmp(e->key, key))
|
||||
{
|
||||
if (!strcmp (e->key, key)) {
|
||||
epairs = e->next;
|
||||
free (e);
|
||||
return self;
|
||||
}
|
||||
|
||||
for (; e ; e=e->next)
|
||||
{
|
||||
if (e->next && !strcmp(e->next->key, key))
|
||||
{
|
||||
|
||||
for (; e; e = e->next) {
|
||||
if (e->next && !strcmp (e->next->key, key)) {
|
||||
e2 = e->next;
|
||||
e->next = e2->next;
|
||||
free (e2);
|
||||
return self;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
printf ("WARNING: removeKeyPair: %s not found\n", key);
|
||||
return self;
|
||||
return self;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -245,37 +239,37 @@ targetname
|
|||
If the entity does not have a "targetname" key, a unique one is generated
|
||||
=============
|
||||
*/
|
||||
- (char *)targetname
|
||||
-(char *) targetname
|
||||
{
|
||||
char *t;
|
||||
int i, count;
|
||||
id ent;
|
||||
int tval, maxt;
|
||||
char name[20];
|
||||
|
||||
t = [self valueForQKey: "targetname"];
|
||||
char *t;
|
||||
int i, count;
|
||||
id ent;
|
||||
int tval, maxt;
|
||||
char name[20];
|
||||
|
||||
t =[self valueForQKey:"targetname"];
|
||||
if (t && t[0])
|
||||
return t;
|
||||
|
||||
|
||||
// make a unique name of the form t<number>
|
||||
count = [map_i count];
|
||||
count =[map_i count];
|
||||
maxt = 0;
|
||||
for (i=1 ; i<count ; i++)
|
||||
{
|
||||
ent = [map_i objectAtIndex: i];
|
||||
t = [ent valueForQKey: "targetname"];
|
||||
for (i = 1; i < count; i++) {
|
||||
ent =[map_i objectAtIndex:i];
|
||||
t =[ent valueForQKey:"targetname"];
|
||||
if (!t || t[0] != 't')
|
||||
continue;
|
||||
tval = atoi (t+1);
|
||||
tval = atoi (t + 1);
|
||||
if (tval > maxt)
|
||||
maxt = tval;
|
||||
}
|
||||
|
||||
sprintf (name,"t%i",maxt+1);
|
||||
|
||||
[self setKey: "targetname" toValue: name];
|
||||
|
||||
return [self valueForQKey: "targetname"]; // so it's not on the stack
|
||||
|
||||
sprintf (name, "t%i", maxt + 1);
|
||||
|
||||
[self setKey: "targetname" toValue:name];
|
||||
|
||||
return[self valueForQKey:"targetname"];
|
||||
// so it's not on the stack
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -286,40 +280,39 @@ FILE METHODS
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
int nument;
|
||||
int nument;
|
||||
|
||||
- initFromScript: (script_t *) script
|
||||
-initFromScript:(script_t *) script
|
||||
{
|
||||
char *key;
|
||||
id eclass, brush;
|
||||
char *spawn;
|
||||
vec3_t emins, emaxs;
|
||||
vec3_t org;
|
||||
texturedef_t td;
|
||||
esize_t esize;
|
||||
int i, c;
|
||||
float *color;
|
||||
|
||||
char *key;
|
||||
id eclass, brush;
|
||||
char *spawn;
|
||||
vec3_t emins, emaxs;
|
||||
vec3_t org;
|
||||
texturedef_t td;
|
||||
esize_t esize;
|
||||
int i, c;
|
||||
float *color;
|
||||
|
||||
[self init];
|
||||
|
||||
if (!Script_GetToken (script, true))
|
||||
{
|
||||
if (!Script_GetToken (script, true)) {
|
||||
[self dealloc];
|
||||
return nil;
|
||||
}
|
||||
|
||||
if (strcmp (Script_Token (script), "{") )
|
||||
if (strcmp (Script_Token (script), "{"))
|
||||
Sys_Error ("initFromFileP: { not found");
|
||||
|
||||
|
||||
do {
|
||||
if (!Script_GetToken (script, true))
|
||||
break;
|
||||
if (!strcmp (Script_Token (script), "}") )
|
||||
if (!strcmp (Script_Token (script), "}"))
|
||||
break;
|
||||
if (!strcmp (Script_Token (script), "{") ) {
|
||||
if (!strcmp (Script_Token (script), "{")) {
|
||||
// read a brush
|
||||
brush = [[SetBrush alloc] initFromScript: script owner:self];
|
||||
[self addObject: brush];
|
||||
brush =[[SetBrush alloc] initFromScript: script owner:self];
|
||||
[self addObject:brush];
|
||||
} else {
|
||||
// read a key / value pair
|
||||
key = strdup (Script_Token (script));
|
||||
|
|
@ -328,122 +321,114 @@ int nument;
|
|||
free (key);
|
||||
}
|
||||
} while (1);
|
||||
|
||||
|
||||
nument++;
|
||||
|
||||
// get class
|
||||
spawn = [self valueForQKey: "classname"];
|
||||
eclass = [entity_classes_i classForName: spawn];
|
||||
spawn =[self valueForQKey:"classname"];
|
||||
eclass =[entity_classes_i classForName:spawn];
|
||||
|
||||
esize = [eclass esize];
|
||||
esize =[eclass esize];
|
||||
|
||||
[self getVector: org forKey: "origin"];
|
||||
|
||||
if ([self count] && esize != esize_model)
|
||||
{
|
||||
printf ("WARNING:Entity with brushes and wrong model type\n");
|
||||
[self getVector: org forKey:"origin"];
|
||||
|
||||
if ([self count] && esize != esize_model) {
|
||||
printf ("WARNING:Entity with brushes and wrong model type\n");
|
||||
[self removeAllObjects];
|
||||
}
|
||||
|
||||
if (![self count] && esize == esize_model)
|
||||
{
|
||||
printf ("WARNING:Entity with no brushes and esize_model\n");
|
||||
[texturepalette_i getTextureDef: &td];
|
||||
for (i=0 ; i<3 ; i++)
|
||||
{
|
||||
|
||||
if (![self count] && esize == esize_model) {
|
||||
printf ("WARNING:Entity with no brushes and esize_model\n");
|
||||
[texturepalette_i getTextureDef:&td];
|
||||
for (i = 0; i < 3; i++) {
|
||||
emins[i] = org[i] - 8;
|
||||
emaxs[i] = org[i] + 8;
|
||||
}
|
||||
brush = [[SetBrush alloc] initOwner: self mins:emins maxs:emaxs
|
||||
texture: &td];
|
||||
[self addObject: brush];
|
||||
brush =[[SetBrush alloc] initOwner: self mins: emins maxs: emaxs texture:&td];
|
||||
[self addObject:brush];
|
||||
}
|
||||
|
||||
// create a brush if needed
|
||||
if (esize == esize_fixed)
|
||||
[self createFixedBrush: org];
|
||||
[self createFixedBrush:org];
|
||||
else
|
||||
modifiable = YES;
|
||||
|
||||
// set all the brush colors
|
||||
color = [eclass drawColor];
|
||||
color =[eclass drawColor];
|
||||
|
||||
c = [self count];
|
||||
for (i=0 ; i<c ; i++)
|
||||
{
|
||||
brush = [self objectAtIndex: i];
|
||||
[brush setEntityColor: color];
|
||||
c =[self count];
|
||||
for (i = 0; i < c; i++) {
|
||||
brush =[self objectAtIndex:i];
|
||||
[brush setEntityColor:color];
|
||||
}
|
||||
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
|
||||
- writeToFILE: (FILE *)f region:(BOOL)reg;
|
||||
-writeToFILE:(FILE *)
|
||||
f region:(BOOL) reg;
|
||||
{
|
||||
epair_t *e;
|
||||
int i;
|
||||
id new;
|
||||
char value[80];
|
||||
vec3_t mins, maxs, org;
|
||||
epair_t *e;
|
||||
int i;
|
||||
id new;
|
||||
char value[80];
|
||||
vec3_t mins, maxs, org;
|
||||
const vec_t *v;
|
||||
BOOL temporg;
|
||||
char oldang[80];
|
||||
|
||||
BOOL temporg;
|
||||
char oldang[80];
|
||||
|
||||
temporg = NO;
|
||||
if (reg)
|
||||
{
|
||||
if ( !strcmp ([self valueForQKey: "classname"], "info_player_start") )
|
||||
{ // move the playerstart temporarily to the camera position
|
||||
if (reg) {
|
||||
if (!strcmp ([self valueForQKey:"classname"], "info_player_start")) {
|
||||
// move the playerstart
|
||||
// temporarily to the camera
|
||||
// position
|
||||
temporg = YES;
|
||||
strcpy (oldang, [self valueForQKey: "angle"]);
|
||||
sprintf (value, "%i", (int)([cameraview_i yawAngle]*180/M_PI));
|
||||
[self setKey: "angle" toValue: value];
|
||||
}
|
||||
else if ( self != [map_i objectAtIndex: 0]
|
||||
&& [[self objectAtIndex: 0] regioned] )
|
||||
return self; // skip the entire entity definition
|
||||
strcpy (oldang,[self valueForQKey:"angle"]);
|
||||
sprintf (value, "%i", (int) ([cameraview_i yawAngle] * 180 / M_PI));
|
||||
[self setKey: "angle" toValue:value];
|
||||
} else if (self !=[map_i objectAtIndex:0]
|
||||
&&[[self objectAtIndex:0] regioned])
|
||||
return self; // skip the entire entity definition
|
||||
}
|
||||
|
||||
fprintf (f,"{\n");
|
||||
|
||||
fprintf (f, "{\n");
|
||||
|
||||
// set an origin epair
|
||||
if (!modifiable)
|
||||
{
|
||||
[[self objectAtIndex: 0] getMins: mins maxs: maxs];
|
||||
if (temporg)
|
||||
{
|
||||
[cameraview_i getOrigin: mins];
|
||||
if (!modifiable) {
|
||||
[[self objectAtIndex: 0] getMins: mins maxs:maxs];
|
||||
if (temporg) {
|
||||
[cameraview_i getOrigin:mins];
|
||||
mins[0] -= 16;
|
||||
mins[1] -= 16;
|
||||
mins[2] -= 48;
|
||||
}
|
||||
new = [entity_classes_i classForName:
|
||||
[self valueForQKey: "classname"]];
|
||||
new =[entity_classes_i classForName:
|
||||
[self valueForQKey:"classname"]];
|
||||
if (new)
|
||||
v = [new mins];
|
||||
v =[new mins];
|
||||
else
|
||||
v = vec3_origin;
|
||||
|
||||
|
||||
VectorSubtract (mins, v, org);
|
||||
sprintf (value, "%i %i %i",(int)org[0], (int)org[1], (int)org[2]);
|
||||
[self setKey:"origin" toValue: value];
|
||||
sprintf (value, "%i %i %i", (int) org[0], (int) org[1], (int) org[2]);
|
||||
[self setKey: "origin" toValue:value];
|
||||
}
|
||||
|
||||
for (e=epairs ; e ; e=e->next)
|
||||
fprintf (f,"\"%s\"\t\"%s\"\n", e->key, e->value);
|
||||
|
||||
|
||||
for (e = epairs; e; e = e->next)
|
||||
fprintf (f, "\"%s\"\t\"%s\"\n", e->key, e->value);
|
||||
|
||||
// fixed size entities don't save out brushes
|
||||
if ( modifiable )
|
||||
{
|
||||
for (i = 0 ; i < [self count]; i++)
|
||||
[[self objectAtIndex: i] writeToFILE: f region: reg];
|
||||
if (modifiable) {
|
||||
for (i = 0; i <[self count]; i++)
|
||||
[[self objectAtIndex: i] writeToFILE: f region:reg];
|
||||
}
|
||||
|
||||
fprintf (f,"}\n");
|
||||
|
||||
|
||||
fprintf (f, "}\n");
|
||||
|
||||
if (temporg)
|
||||
[self setKey: "angle" toValue: oldang];
|
||||
[self setKey: "angle" toValue:oldang];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue