Skip to content

Commit e6f3542

Browse files
JakeOShannessyJakeOShannessy
committed
remove use_bw
As display lists are no longer present, the `use_bw` property of objects is no longer used and can be removed. This also means that `setbw` no longer needs to be passed to the parser. SETBW as a configuration option works separately.
1 parent 266d0f3 commit e6f3542

File tree

8 files changed

+43
-53
lines changed

8 files changed

+43
-53
lines changed

‎Source/shared/readobject.c

Lines changed: 35 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,18 @@
2727

2828
int GetTokenId(char *token, int *opptr, int *num_opptr, int *num_outopptr);
2929
void ParseSmvObjectString(object_collection *objectscoll, char *string,
30-
char **tokens, int *ntokens, int setbw);
30+
char **tokens, int *ntokens);
3131
sv_object *InitSmvObject1(object_collection *objectscoll, const char *label,
32-
const char *commands, int visible, int setbw);
32+
const char *commands, int visible);
3333
sv_object *InitSmvObject2(object_collection *objectscoll, const char *label,
3434
const char *commandsoff, const char *commandson,
35-
int visible, int setbw);
35+
int visible);
3636
sv_object *GetSmvObjectType2(object_collection *objectscoll, char *olabel,
3737
sv_object *default_object);
3838
void FreeObject(sv_object *object);
3939

4040
char *ParseObjectFrame(object_collection *objectscoll, const char *buffer,
41-
FILE *stream, int *eof, sv_object_frame *frame,
42-
int setbw);
41+
FILE *stream, int *eof, sv_object_frame *frame);
4342

4443
/* ----------------------- FreeObject ----------------------------- */
4544

@@ -140,7 +139,7 @@ sv_object *GetSmvObjectType2(object_collection *objectscoll, char *olabel,
140139
/* ------------------ ParseSmvObjectString ------------------------ */
141140

142141
void ParseSmvObjectString(object_collection *objectscoll, char *string,
143-
char **tokens, int *ntokens, int setbw){
142+
char **tokens, int *ntokens){
144143
int i, len, in_quote, in_token, last_in_token, ntok2 = 0;
145144
char *c;
146145
char *tokens_head[BUFFER_SIZE], *tokens_tail[BUFFER_SIZE];
@@ -210,7 +209,7 @@ void ParseSmvObjectString(object_collection *objectscoll, char *string,
210209
"0 0 255 setrgb push 45.0 rotatey -0.1 offsetz 0.05 0.2 drawdisk "
211210
"pop push -45.0 rotatey -0.1 offsetz 0.05 0.2 drawdisk pop");
212211
objectscoll->std_object_defs.missing_device = InitSmvObject1(
213-
objectscoll, "missing_device", com_buffer, 1, setbw);
212+
objectscoll, "missing_device", com_buffer, 1);
214213
}
215214

216215
included_object =
@@ -288,8 +287,7 @@ void GetIndepVarIndices(sv_object *smv_object, char **var_indep_strings,
288287

289288
// Previously ParseDeviceFrame
290289
char *ParseObjectFrame(object_collection *objectscoll, const char *buffer_in,
291-
FILE *stream, int *eof, sv_object_frame *frame,
292-
int setbw){
290+
FILE *stream, int *eof, sv_object_frame *frame){
293291
char buffer[1024];
294292
strcpy(buffer, buffer_in);
295293

@@ -321,7 +319,7 @@ char *ParseObjectFrame(object_collection *objectscoll, const char *buffer_in,
321319
strcat(object_buffer, " ");
322320
strcat(object_buffer, buffer2);
323321
}
324-
ParseSmvObjectString(objectscoll, object_buffer, tokens, &ntokens, setbw);
322+
ParseSmvObjectString(objectscoll, object_buffer, tokens, &ntokens);
325323
frame->ntokens = ntokens;
326324
if(ntokens > 0){
327325
NewMemory((void **)&frame->tokens, ntokens * sizeof(tokendata));
@@ -1068,7 +1066,7 @@ int GetObjectFrameTokenLoc(char *var, sv_object_frame *frame){
10681066

10691067
sv_object *InitSmvObject2(object_collection *objectscoll, const char *label,
10701068
const char *commandsoff, const char *commandson,
1071-
int visible, int setbw){
1069+
int visible){
10721070
sv_object *object;
10731071
int i;
10741072

@@ -1091,17 +1089,15 @@ sv_object *InitSmvObject2(object_collection *objectscoll, const char *label,
10911089
object->obj_frames[0] = framei;
10921090
framei->error = 0;
10931091
framei->device = object;
1094-
ParseObjectFrame(objectscoll, commandsoff, NULL, &eof, framei, setbw);
1095-
framei->use_bw = setbw;
1092+
ParseObjectFrame(objectscoll, commandsoff, NULL, &eof, framei);
10961093
framei->ntextures = 0;
10971094
}
10981095
else{
10991096
NewMemory((void **)&framei, sizeof(sv_object_frame));
11001097
object->obj_frames[1] = framei;
11011098
framei->device = object;
1102-
ParseObjectFrame(objectscoll, commandson, NULL, &eof, framei, setbw);
1099+
ParseObjectFrame(objectscoll, commandson, NULL, &eof, framei);
11031100
framei->error = 0;
1104-
framei->use_bw = setbw;
11051101
framei->ntextures = 0;
11061102
}
11071103
}
@@ -1111,7 +1107,7 @@ sv_object *InitSmvObject2(object_collection *objectscoll, const char *label,
11111107
/* ----------------------- InitSmvObject1 ----------------------------- */
11121108

11131109
sv_object *InitSmvObject1(object_collection *objectscoll, const char *label,
1114-
const char *commands, int visible, int setbw){
1110+
const char *commands, int visible){
11151111
sv_object *object;
11161112
sv_object_frame *framei;
11171113
int eof;
@@ -1129,9 +1125,8 @@ sv_object *InitSmvObject1(object_collection *objectscoll, const char *label,
11291125

11301126
object->obj_frames[0] = framei;
11311127
framei->device = object;
1132-
ParseObjectFrame(objectscoll, commands, NULL, &eof, framei, setbw);
1128+
ParseObjectFrame(objectscoll, commands, NULL, &eof, framei);
11331129
framei->error = 0;
1134-
framei->use_bw = setbw;
11351130
framei->ntextures = 0;
11361131
return object;
11371132
}
@@ -1170,8 +1165,7 @@ sv_object *GetSmvObject(object_collection *objectscoll, char *label){
11701165

11711166
/* ----------------------- ReadObjectDefs ----------------------------- */
11721167

1173-
int ReadObjectDefs(object_collection *objectscoll, const char *file,
1174-
int setbw){
1168+
int ReadObjectDefs(object_collection *objectscoll, const char *file){
11751169
FILE *stream;
11761170
char buffer[256], *trim_buffer;
11771171
char *buffer_ptr;
@@ -1264,7 +1258,6 @@ int ReadObjectDefs(object_collection *objectscoll, const char *file,
12641258
current_frame->next = next_frame;
12651259
current_frame->prev = prev_frame;
12661260

1267-
current_frame->use_bw = setbw;
12681261
current_frame->device = current_object;
12691262
current_object->nframes++;
12701263

@@ -1277,7 +1270,7 @@ int ReadObjectDefs(object_collection *objectscoll, const char *file,
12771270
// If a frame has not been started, don't try and parse it.
12781271
if(current_frame != NULL){
12791272
buffer_ptr = ParseObjectFrame(objectscoll, buffer, stream, &eof,
1280-
current_frame, setbw);
1273+
current_frame);
12811274
}
12821275
}
12831276
fclose(stream);
@@ -1359,7 +1352,7 @@ int ReadObjectDefs(object_collection *objectscoll, const char *file,
13591352

13601353
/* ----------------------- InitAvatar ----------------------------- */
13611354

1362-
void InitAvatar(object_collection *objectscoll, int setbw){
1355+
void InitAvatar(object_collection *objectscoll){
13631356
int iavatar_types_local;
13641357
sv_object *objecti, *object_start;
13651358
char com_buffer[1024];
@@ -1380,13 +1373,13 @@ void InitAvatar(object_collection *objectscoll, int setbw){
13801373
strcat(com_buffer, "0.0 0.0 1.0 translate 255 0 0 setrgb 0.03 0.1 drawdisk 0 "
13811374
"0 255 setrgb 90.0 rotatey 0.03 0.2 drawdisk");
13821375
objectscoll->avatar_defs_backup[0] =
1383-
InitSmvObject1(objectscoll, "Avatar_1", com_buffer, 1, setbw);
1376+
InitSmvObject1(objectscoll, "Avatar_1", com_buffer, 1);
13841377
objectscoll->avatar_defs_backup[0]->type = IS_AVATAR;
13851378

13861379
strcpy(com_buffer, labels);
13871380
strcat(com_buffer, "255 255 0 setrgb 0.02 0.05 drawdisk");
13881381
objectscoll->avatar_defs_backup[1] =
1389-
InitSmvObject1(objectscoll, "Avatar_2", com_buffer, 1, setbw);
1382+
InitSmvObject1(objectscoll, "Avatar_2", com_buffer, 1);
13901383
objectscoll->avatar_defs_backup[1]->type = IS_AVATAR;
13911384

13921385
objectscoll->avatar_types[0] = objectscoll->avatar_defs_backup[0];
@@ -1401,44 +1394,43 @@ void InitAvatar(object_collection *objectscoll, int setbw){
14011394

14021395
/* ------------------ InitStdObjectDefs ------------------------ */
14031396

1404-
void InitStdObjectDefs(object_collection *objectscoll, int setbw,
1405-
int isZoneFireModel){
1397+
void InitStdObjectDefs(object_collection *objectscoll, int isZoneFireModel){
14061398
if(isZoneFireModel == 1){
14071399
objectscoll->std_object_defs.target_object_backup = InitSmvObject1(
1408-
objectscoll, "target", "255 255 0 setrgb 0.02 0.05 drawdisk", 1, setbw);
1400+
objectscoll, "target", "255 255 0 setrgb 0.02 0.05 drawdisk", 1);
14091401
}
14101402
else{
14111403
objectscoll->std_object_defs.target_object_backup = InitSmvObject1(
1412-
objectscoll, "sensor", "255 255 0 setrgb 0.038 drawcube", 1, setbw);
1404+
objectscoll, "sensor", "255 255 0 setrgb 0.038 drawcube", 1);
14131405
}
14141406

14151407
objectscoll->std_object_defs.thcp_object_backup = InitSmvObject1(
1416-
objectscoll, "thcp", "255 255 0 setrgb 0.038 drawcube", 1, setbw);
1408+
objectscoll, "thcp", "255 255 0 setrgb 0.038 drawcube", 1);
14171409

14181410
objectscoll->std_object_defs.heat_detector_object_backup = InitSmvObject2(
14191411
objectscoll, "heat_detector", "0 255 0 setrgb 0.038 drawcube",
1420-
"255 0 0 setrgb 0.038 drawcube", 1, setbw);
1412+
"255 0 0 setrgb 0.038 drawcube", 1);
14211413

14221414
objectscoll->std_object_defs.sprinkler_upright_object_backup = InitSmvObject2(
14231415
objectscoll, "sprinkler_upright", "0 255 0 setrgb 0.038 drawcube",
1424-
"255 0 0 setrgb 0.038 drawcube", 1, setbw);
1416+
"255 0 0 setrgb 0.038 drawcube", 1);
14251417

14261418
objectscoll->std_object_defs.smoke_detector_object_backup = InitSmvObject2(
14271419
objectscoll, "smoke_detector", "127 127 127 setrgb 0.2 0.05 drawdisk",
1428-
"255 0 0 setrgb 0.2 0.05 drawdisk", 1, setbw);
1420+
"255 0 0 setrgb 0.2 0.05 drawdisk", 1);
14291421

14301422
objectscoll->std_object_defs.error_device = InitSmvObject1(
14311423
objectscoll, "error_device",
14321424
"255 0 0 setrgb push 45.0 rotatey -0.1 offsetz 0.05 0.2 drawdisk pop "
14331425
"push -45.0 rotatey -0.1 offsetz 0.05 0.2 drawdisk pop",
1434-
1, setbw);
1426+
1);
14351427

14361428
if(objectscoll->std_object_defs.missing_device == NULL){
14371429
objectscoll->std_object_defs.missing_device = InitSmvObject1(
14381430
objectscoll, "missing_device",
14391431
"0 0 255 setrgb push 45.0 rotatey -0.1 offsetz 0.05 0.2 drawdisk "
14401432
"pop push -45.0 rotatey -0.1 offsetz 0.05 0.2 drawdisk pop",
1441-
1, setbw);
1433+
1);
14421434
}
14431435
}
14441436

@@ -1492,7 +1484,7 @@ void LoadDefaultObjectDefs(object_collection *objectscoll){
14921484
/* ----------------------- InitObjectDefs ----------------------------- */
14931485

14941486
void ReadDefaultObjectCollection(object_collection *objectscoll,
1495-
const char *fdsprefix, int setbw,
1487+
const char *fdsprefix,
14961488
int isZoneFireModel){
14971489
char objectfile[1024];
14981490

@@ -1511,36 +1503,36 @@ void ReadDefaultObjectCollection(object_collection *objectscoll,
15111503
if(smv_bindir){
15121504
strcpy(objectfile, smv_bindir);
15131505
strcat(objectfile, "objects.svo");
1514-
ReadObjectDefs(objectscoll, objectfile, setbw);
1506+
ReadObjectDefs(objectscoll, objectfile);
15151507
}
15161508
FREEMEMORY(smv_bindir);
15171509

15181510
// Read "objects.svo" from the current directory.
15191511
strcpy(objectfile, "objects.svo");
1520-
ReadObjectDefs(objectscoll, objectfile, setbw);
1512+
ReadObjectDefs(objectscoll, objectfile);
15211513

15221514
// Read "${fdsprefix}.svo" from the current directory
15231515
if(fdsprefix != NULL){
15241516
strcpy(objectfile, fdsprefix);
15251517
strcat(objectfile, ".svo");
1526-
ReadObjectDefs(objectscoll, objectfile, setbw);
1518+
ReadObjectDefs(objectscoll, objectfile);
15271519
}
15281520

15291521
#ifdef SMOKEVIEW_OBJECT_DEFS_PATH
15301522
// Read objects file pointed to be macro SMOKEVIEW_OBJECT_DEFS_PATH.
15311523
// Useful when install paths differ per platform.
1532-
ReadObjectDefs(objectscoll, SMOKEVIEW_OBJECT_DEFS_PATH, set_bw);
1524+
ReadObjectDefs(objectscoll, SMOKEVIEW_OBJECT_DEFS_PATH);
15331525
#endif
15341526

15351527
// Read objects file from the envar SMOKEVIEW_OBJECT_DEFS
15361528
char *envar_object_path = getenv("SMOKEVIEW_OBJECT_DEFS");
15371529
if(envar_object_path != NULL){
1538-
ReadObjectDefs(objectscoll, envar_object_path, setbw);
1530+
ReadObjectDefs(objectscoll, envar_object_path);
15391531
}
15401532

1541-
InitAvatar(objectscoll, setbw);
1533+
InitAvatar(objectscoll);
15421534

1543-
InitStdObjectDefs(objectscoll, setbw, isZoneFireModel);
1535+
InitStdObjectDefs(objectscoll, isZoneFireModel);
15441536

15451537
// If no objects were read, insert the 4 standard objects
15461538
if(objectscoll->nobject_defs == 0){

‎Source/shared/readobject.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,12 @@ int InitObjectCollection(object_collection *coll);
321321
* @param[inout] objectscoll Pointer to the location of the @ref
322322
* object_collection to read object definitions into. This @ref
323323
* object_collection
324-
* @param[in] setbw Set the colors to black and white.
325324
* @param[in] fdsprefix The fdsprefix. This is used to find case-specific object
326325
* files (e.g., "${fdsprefix}.svo"). If NULL, such files are never read.
327326
* @param[in] isZoneFireModel Is this model a zone fire model.
328327
*/
329328
void ReadDefaultObjectCollection(object_collection *objectscoll,
330-
const char *fdsprefix, int setbw,
329+
const char *fdsprefix,
331330
int isZoneFireModel);
332331

333332
/**
@@ -381,7 +380,7 @@ sv_object *GetSmvObjectType(object_collection *objectscoll, char *olabel,
381380
*
382381
* @returns The number of objects read
383382
*/
384-
int ReadObjectDefs(object_collection *objectscoll, const char *file, int setbw);
383+
int ReadObjectDefs(object_collection *objectscoll, const char *file);
385384
// END MAIN API
386385

387386
// These still need to be documented.

‎Source/shared/shared_structures.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ typedef struct _tokendata {
3737
* This can form a node in a linked-list.
3838
*/
3939
typedef struct _sv_object_frame {
40-
int use_bw;
4140
int error;
4241
int *symbols, nsymbols;
4342
tokendata *tokens, **command_list;

‎Source/smokeview/menus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2790,7 +2790,7 @@ void SmokeviewIniMenu(int value){
27902790
WriteIni(LOCAL_INI,NULL);
27912791
break;
27922792
case MENU_READSVO:
2793-
ReadDefaultObjectCollection(&global_scase.objectscoll, global_scase.fdsprefix, setbw, global_scase.isZoneFireModel);
2793+
ReadDefaultObjectCollection(&global_scase.objectscoll, global_scase.fdsprefix, global_scase.isZoneFireModel);
27942794
break;
27952795
case MENU_DUMMY:
27962796
break;

‎Source/smokeview/readsmv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7022,7 +7022,7 @@ int ReadSMV_Init(smv_case *scase){
70227022
// read in device (.svo) definitions
70237023

70247024
START_TIMER(timer_setup);
7025-
ReadDefaultObjectCollection(&scase->objectscoll, scase->fdsprefix, setbw, scase->isZoneFireModel);
7025+
ReadDefaultObjectCollection(&scase->objectscoll, scase->fdsprefix, scase->isZoneFireModel);
70267026
PRINT_TIMER(timer_setup, "InitSurface");
70277027

70287028
if(scase->noutlineinfo>0){

‎Tests/parse_objects.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ int main(int argc, char **argv) {
2020
const char *file_path = argv[1];
2121
// Create an object collection, read in object definitions, then free it.
2222
object_collection *objectscoll = CreateObjectCollection();
23-
int result = ReadObjectDefs(objectscoll, file_path, 0);
23+
int result = ReadObjectDefs(objectscoll, file_path);
2424
// Two of the objects in this bad file are still parsable so we should
2525
// parse 2 object definitions.
2626
assert(result > 0);

‎Tests/test_labels.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ int main(int argc, char **argv) {
7474
// const char *bad_file_path = argv[1];
7575
// // Create an object collection, read in object definitions, then free it.
7676
// object_collection *objectscoll = CreateObjectCollection();
77-
// int result = ReadObjectDefs(objectscoll, bad_file_path, 0);
77+
// int result = ReadObjectDefs(objectscoll, bad_file_path);
7878
// // Two of the objects in this bad file are still parsable so we should
7979
// // parse 2 object definitions.
8080
// assert(result == 2);

‎Tests/test_objects.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ int main(int argc, char **argv) {
2828
object_collection *objectscoll = CreateObjectCollection();
2929
// There should be no objects to begin with
3030
assert(objectscoll->nobject_defs == 0);
31-
ReadDefaultObjectCollection(objectscoll, NULL, 0, 0);
31+
ReadDefaultObjectCollection(objectscoll, NULL, 0);
3232
FreeObjectCollection(objectscoll);
3333
}
3434
{
3535
// Create an object collection, read in object definitions, then free it.
3636
object_collection *objectscoll = CreateObjectCollection();
37-
ReadDefaultObjectCollection(objectscoll, NULL, 0, 0);
37+
ReadDefaultObjectCollection(objectscoll, NULL, 0);
3838
FreeObjectCollection(objectscoll);
3939
}
4040
return 0;

0 commit comments

Comments
 (0)