qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 23:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Camera view seems to work moderately well.

Browse source
This commit is contained in:
Bill Currie 2010-09-12 22:40:50 +09:00
parent 27ad18de3d
commit 6ede64c663
4 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes
View file

@ -74,6 +74,7 @@
"setCurrentProject:", "setCurrentProject:",
"setFlags:", "setFlags:",
"setModeRadio:", "setModeRadio:",
"setParent:",
"setXYRegion:", "setXYRegion:",
"shortBrush:", "shortBrush:",
"subtractSelection:", "subtractSelection:",
@ -226,6 +227,15 @@
); );
Super = NSObject; Super = NSObject;
}; };
TextureView = {
Actions = (
"setParent:"
);
Outlets = (
parent_i
);
Super = NSView;
};
Things = { Things = {
Actions = ( Actions = (
"reloadEntityClasses:", "reloadEntityClasses:",

BIN
tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm
View file

Binary file not shown.

6
tools/Forge/Bundles/MapEdit/QuakeEd.m
View file

@ -306,7 +306,11 @@ App delegate methods
postappdefined (); postappdefined ();
return self; return self;
} }
Sys_Printf ("updating %d %d\n", (int)[map_i count], (int)[[map_i currentEntity] count]); Sys_Printf ("updating %d %d %p %d %p %d\n",
(int)[map_i count],
(int)[[map_i currentEntity] count],
entitycount_i, [entitycount_i intValue],
brushcount_i, [brushcount_i intValue]);
[self disableFlushWindow]; [self disableFlushWindow];

8
tools/Forge/Bundles/MapEdit/TexturePalette.m
View file

@ -163,7 +163,6 @@ void
TEX_InitFromWad (char *path) TEX_InitFromWad (char *path)
{ {
int i; int i;
char local[1024];
char newpath[1024]; char newpath[1024];
float start, stop; float start, stop;
wad_t *wad; wad_t *wad;
@ -189,7 +188,6 @@ TEX_InitFromWad (char *path)
lumpinfo = wad->lumps; lumpinfo = wad->lumps;
if (strcmp (lumpinfo->name, "PALETTE")) { if (strcmp (lumpinfo->name, "PALETTE")) {
unlink (local);
Sys_Error ("TEX_InitFromWad: %s doesn't have palette as 0", path); Sys_Error ("TEX_InitFromWad: %s doesn't have palette as 0", path);
} }
@ -207,7 +205,7 @@ TEX_InitFromWad (char *path)
stop = Sys_DoubleTime (); stop = Sys_DoubleTime ();
Sys_Printf ("loaded %s (%5.1f)\n", local, stop - start); Sys_Printf ("loaded %s (%5.1f)\n", newpath, stop - start);
} }
/* /*
@ -273,8 +271,8 @@ TEX_ForName (char *name)
if (textureList_i) if (textureList_i)
[textureList_i empty]; [textureList_i empty];
else else
textureList_i =[[Storage alloc] textureList_i = [[Storage alloc] initCount: 0
initCount: 0 elementSize:sizeof (texpal_t) elementSize: sizeof (texpal_t)
description: NULL]; description: NULL];
// Init STORAGE // Init STORAGE