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

Finish the gorm file, for certain values of finished.

Browse source
This commit is contained in:
Bill Currie 2010-09-14 22:17:35 +09:00
parent b215a5e856
commit 7d5af7c341
11 changed files with 59 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/Forge/Bundles/MapEdit/Clipper.m
View file

@ -188,8 +188,8 @@ XYDrag
char text[8];
PSsetrgbcolor (1, 0.5, 0);
GSSetFont (DEFCTXT, [NSFont fontWithName: @"Helvetica-Medium"
size: 10 / [xyview_i currentScale]]);
[[NSFont systemFontOfSize: 10 / [xyview_i currentScale]] set];
PSrotate (0);
for (i = 0; i < num; i++) {
@ -209,8 +209,7 @@ XYDrag
char text[8];
PSsetrgbcolor (1, 0.5, 0);
GSSetFont (DEFCTXT, [NSFont fontWithName: @"Helvetica-Medium"
size: 10 / [zview_i currentScale]]);
[[NSFont systemFontOfSize: 10 / [zview_i currentScale]] set];
PSrotate (0);
for (i = 0; i < num; i++) {

4
tools/Forge/Bundles/MapEdit/GNUmakefile
View file

@ -21,8 +21,8 @@ ADDITIONAL_GUI_LIBS +=
#
# Resource files
#
QuakeEd_MAIN_MODEL_FILE= MapEdit.gorm
QuakeEd_RESOURCE_FILES= MapEdit.gorm
QuakeEd_MAIN_MODEL_FILE= QuakeEd.gmodel
QuakeEd_RESOURCE_FILES= QuakeEd.gmodel
QuakeEd_LOCALIZED_RESOURCE_FILES=

11
tools/Forge/Bundles/MapEdit/InspectorControl.m
View file

@ -8,6 +8,11 @@
id inspcontrol_i;
@interface CustomView:NSView
@end
@implementation CustomView
@end
@implementation InspectorControl
-awakeFromNib {
@ -15,9 +20,9 @@ id inspcontrol_i;
currentInspectorType = -1;
contentList =[[NSArray alloc] init];
windowList =[[NSArray alloc] init];
itemList =[[NSArray alloc] init];
contentList =[[NSMutableArray alloc] init];
windowList =[[NSMutableArray alloc] init];
itemList =[[NSMutableArray alloc] init];
// ADD NEW INSPECTORS HERE...

3
tools/Forge/Bundles/MapEdit/KeypairView.m
View file

@ -48,8 +48,7 @@ initWithFrame:
PSsetgray(NSLightGray);
PSrectfill (0, 0, _bounds.size.width, _bounds.size.height);
GSSetFont (DEFCTXT, [NSFont fontWithName: @"Helvetica-Medium"
size: FONTSIZE]);
[[NSFont systemFontOfSize: FONTSIZE] set];
PSrotate (0);
PSsetgray (0);

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

@ -12,6 +12,13 @@
);
Super = NSView;
};
Clipper = {
Actions = (
);
Outlets = (
);
Super = NSObject;
};
FirstResponder = {
Actions = (
"BSP_FastVis:",
@ -86,6 +93,37 @@
);
Super = NSObject;
};
InspectorControl = {
Actions = (
"changeInspector:"
);
Outlets = (
inspectorView_i,
inspectorSubview_i,
contentList,
windowList,
obj_textures_i,
obj_genkeypair_i,
popUpButton_i,
popUpMatrix_i,
itemList,
win_project_i,
win_textures_i,
win_things_i,
win_prefs_i,
win_settings_i,
win_output_i,
win_help_i,
itemProject_i,
itemTextures_i,
itemThings_i,
itemPrefs_i,
itemSettings_i,
itemOutput_i,
itemHelp_i
);
Super = NSObject;
};
Map = {
Actions = (
"setCurrentEntity:",

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

Binary file not shown.

3
tools/Forge/Bundles/MapEdit/Project.m
View file

@ -205,7 +205,7 @@ t in:(id) obj
// Fill the QuakeEd Maps or wads browser
// (Delegate method - delegated in Interface Builder)
//
-(int) browser: sender fillMatrix: matrix inColumn:(int) column
-(void) browser: sender createRowsForColumn:(int) column inMatrix: matrix
{
id cell, list;
int max;
@ -230,7 +230,6 @@ t in:(id) obj
[cell setLeaf:YES];
[cell setLoaded:YES];
}
return i;
}
//

2
tools/Forge/Bundles/MapEdit/TextureView.m
View file

@ -44,7 +44,7 @@ NOTE: I am specifically not using cached image reps, because the data is also ne
selected =[parent_i getSelectedTexture];
list_i =[parent_i getList];
GSSetFont (DEFCTXT,[NSFont fontWithName: @"Helvetica-Medium" size:FONTSIZE]);
[[NSFont systemFontOfSize: FONTSIZE] set];
PSrotate (0);
PSsetgray (NSLightGray);

7
tools/Forge/Bundles/MapEdit/Things.m
View file

@ -150,7 +150,7 @@ id things_i;
else
flags = atoi (flagname);
[flags_i setAutodisplay:NO];
//[flags_i setAutodisplay:NO];
for (r = 0; r < 4; r++)
for (c = 0; c < 3; c++) {
cell =[flags_i cellAtRow: r column:c];
@ -160,7 +160,7 @@ id things_i;
}
[cell setIntValue:(flags & (1 << ((c * 4) + r))) > 0];
}
[flags_i setAutodisplay:YES];
//[flags_i setAutodisplay:YES];
[flags_i display];
// [keyInput_i setStringValue: ""];
@ -294,7 +294,7 @@ id things_i;
// Fill the Entity browser
// (Delegate method - delegated in Interface Builder)
//
-(int) browser: sender fillMatrix: matrix inColumn:(int) column
-(void) browser: sender createRowsForColumn:(int) column inMatrix: matrix
{
id cell;
int max;
@ -312,7 +312,6 @@ id things_i;
[cell setLeaf:YES];
[cell setLoaded:YES];
}
return i;
}
@end

3
tools/Forge/Bundles/MapEdit/XYView.m
View file

@ -799,8 +799,7 @@ NSRect xy_draw_rect;
// setup for text
// PSselectfont("Helvetica-Medium",10/scale);
//GSSetFont (DEFCTXT,[NSFont fontWithName: @"Helvetica-Medium" size:10 / scale]);
[[NSFont systemFontOfSize: 10] set];
[[NSFont systemFontOfSize: 10 / scale] set];
PSrotate (0);
if (drawmode == dr_texture || drawmode == dr_flat)

3
tools/Forge/Bundles/MapEdit/ZView.m
View file

@ -389,8 +389,7 @@ Rect is in global world (unscaled) coordinates
[path removeAllPoints];
PSsetgray (0); // for text
//GSSetFont (DEFCTXT,[NSFont fontWithName: @"Helvetica-Medium" size:10 / scale]);
[[NSFont systemFontOfSize: 10] set];
[[NSFont systemFontOfSize: 10 / scale] set];
PSrotate (0);
for (; y <= stopy; y += 64) {