Commit graph

1757 commits

Author SHA1 Message Date
Bill Currie
56fb4d9a22 allow safe bsp freeing
any memory the bsp thinks it does not own will not be freed
2010-10-13 20:52:05 +09:00
Bill Currie
99d8ea22b4 fix uninitialized data
In the process of testing the changes to WriteBSPFile, it was found that
the data being supplied to it contained uninitialized values.
2010-10-13 20:52:05 +09:00
Bill Currie
f4042c5b91 Make the bsp disk data structures type size independent.
However, this assumes float is always 32 bits.

Also use size_t for the *size fields in bsp_t and clean up the mess.
2010-10-13 20:52:05 +09:00
Bill Currie
13b5dade87 Add some view opacity. 2010-10-12 18:26:24 +09:00
Bill Currie
74de76faa0 Remove some unused files. 2010-10-11 21:13:34 +09:00
Bill Currie
9daf527afd Do a bit of comment cleanup. 2010-10-11 21:11:33 +09:00
Bill Currie
a9987467ec Allow entity copying too. 2010-10-11 09:52:10 +09:00
Bill Currie
1945da99d9 Can now copy brushes.
Implement SetBrush's copyWithZone:
2010-10-11 09:19:09 +09:00
Jeff Teunissen
708c8743af Cope gracefully with wadfiles we can't handle
This is a weird little diff. We're doing a lot of gymnastics here so that
we don't have to crash (killing any loaded unsaved work!) when we find a
wadfile we don't know how to deal with.
2010-10-10 06:23:37 -04:00
Bill Currie
670d9155e7 Fix key resetting.
Make sure we don't add a new key-pair when the key already exists, and if
the existing value has the same pointer as the "new" value, do nothing.
2010-10-10 18:47:27 +09:00
Bill Currie
eeb6af7af9 Merge branch 'forge' of ssh://quake.git.sf.net/gitroot/quake/quakeforge into forge 2010-10-10 17:08:32 +09:00
Bill Currie
7414fcf515 Can now select textures. 2010-10-10 17:07:48 +09:00
Jeff Teunissen
942a6ba6f0 return the actual string
Oops. I returned a text field instead of the string in it. :)
2010-10-10 03:55:01 -04:00
Jeff Teunissen
34cf3f7570 Export the base directory of the open project
Project -baseDirectoryPath returns the absolute path to the directory from
which the .qpr file was loaded.
2010-10-10 03:39:29 -04:00
Bill Currie
39da12282c Merge branch 'forge' of ssh://quake.git.sf.net/gitroot/quake/quakeforge into forge 2010-10-10 15:53:19 +09:00
Bill Currie
b2cdede898 Correctly initialize the path variables.
Use the current project file, not the default.
2010-10-10 15:52:18 +09:00
Jeff Teunissen
0bb30fc994 TexturePalette.m: microscopic update
remove a bogus comment, clarify a printf call, add parens around a ternary
test.
2010-10-10 02:24:35 -04:00
Jeff Teunissen
92b735fe40 TexturePalette: Prevent NULL dereference
Keep the app from crashing on a wad that doesn't have any palette at all.
2010-10-10 01:51:22 -04:00
Bill Currie
8f92076b32 Fix brush selection.
The great cleanup caused a few vital returns to disappear (they probably
went to the same place a lot of my lego did).
2010-10-10 13:07:28 +09:00
Bill Currie
29d544d766 Don't crash if the palette entry is not first.
Instead, swap the palette entry and the first entry (only in memory).
2010-10-09 21:57:18 +09:00
Bill Currie
0082b93283 Correct miptex byte-count scaling factor. 2010-10-09 21:56:04 +09:00
Bill Currie
f59eec415c Support Quests' map format.
This is mostly because I have a few maps in this format.
2010-10-09 15:36:47 +09:00
Bill Currie
f9ffb30d9a Got the value/key backwards. 2010-10-09 15:04:40 +09:00
Bill Currie
186657c784 Even more conversions to NSString 2010-10-09 10:02:05 +09:00
Bill Currie
958b878282 More conversions to NSString 2010-10-09 09:49:35 +09:00
Bill Currie
33a4f589d0 Do a lot of conversions to NSString. 2010-10-07 17:58:26 +09:00
Bill Currie
7ec21cbb39 Change path_projectinfo to NSString. 2010-10-05 23:48:56 +09:00
Bill Currie
00d33ccbf4 It seems I forgot to commit this with the plist changes. 2010-10-05 23:48:06 +09:00
Bill Currie
3593274eeb Fix wad loading when loading the map.
This broke with the fix for the entity inspector.
2010-10-04 19:44:37 +09:00
Bill Currie
05a8b981a5 Use QF's property lists for the project file. 2010-10-04 19:43:33 +09:00
Bill Currie
1a994ab784 First step in cleaning up Dict. 2010-10-02 21:00:15 +09:00
Bill Currie
57e6bf84a6 Correct an error message. 2010-10-02 20:35:22 +09:00
Bill Currie
5cc5daf89a Get the button icons set properly.
There are still issues with the way gorm does things, but this works for
now.
2010-10-01 19:00:10 +09:00
Jeff Teunissen
102cf9bca9 install images into Resources
Install the button icons into the app when we make it.
2010-10-01 05:51:43 -04:00
Jeff Teunissen
5588d9d782 find $GNUSTEP_MAKEFILES
Enable locating the GNUstep makefiles using the various schemes available
(in order of reliability), eventually reaching a hardcoded default.
2010-09-29 18:46:34 -04:00
Jeff Teunissen
fb785c334b tactical whitespace bomb
Add return-type information to all methods, split up lines properly where
I could find them, and ran the whole thing through uncrustify. Looks purty
now. :)
2010-09-29 16:09:11 -04:00
Jeff Teunissen
77e6624de3 Remove -read:/-write from Storage
Apparently GS doesn't do TypedStream any more...
2010-09-28 15:49:54 -04:00
Jeff Teunissen
ec0c37ee82 Add type information, don't return self most of the time
Start "modernizing" the code base; old code is based heavily in the
Smalltalk style, where everything that doesn't return a different object
returns self. This can be useful, but it isn't what is usually done these
days. Also, add type information (which didn't exist in "the old days" --
an object was an "id", not a "Foo *") to help with debugging.
2010-09-28 15:43:35 -04:00
Jeff Teunissen
7db4cefb2c SetBrush: signed/unsigned fix 2010-09-28 12:13:25 -04:00
Jeff Teunissen
32c1bae1f2 Comment an #if 0
Looks like John Carmack was going to implement "reference" .qpr directories,
where they would contain a reference to the "real" base path, but never got
it finished. Make a note in the source to explain the "dead" code.
2010-09-28 12:13:25 -04:00
Jeff Teunissen
ad6e799981 signed/unsigned and some const-correctness 2010-09-28 12:13:25 -04:00
Bill Currie
3515816b33 Get the timing right when setting the wad file in worldspawn. 2010-09-28 22:17:31 +09:00
Bill Currie
cdf42a844c Do error checking when trying to load a wad file. 2010-09-28 22:17:07 +09:00
Bill Currie
d13e2aeded Char buffer audit.
Get rid of most static char buffers. The few remaining are either in file
structs or messy code that needs further analysis.
2010-09-28 21:40:11 +09:00
Bill Currie
7c2709e8f8 Do a const-correct run. 2010-09-28 18:41:38 +09:00
Bill Currie
a794752d78 Fix the tangled mess of entity connections.
What was the person who wrote valueForQKey thinking? Make the function
const-correct and bubble the changes through the code.
2010-09-28 00:29:16 +09:00
Bill Currie
0d37832af3 Connect the region filtering switch.
Region filtering now seems to work. Also added a tool tip.
2010-09-28 00:02:24 +09:00
Bill Currie
583ab0622a Get the entity flags switches into the right initial stage. 2010-09-27 23:18:10 +09:00
Bill Currie
d8858c29e3 Echo the output to stdout as well as the output box. 2010-09-27 22:06:37 +09:00
Bill Currie
8057e6d8de Get the inspector button displaying properly. 2010-09-27 21:59:25 +09:00
Bill Currie
3e9f72ef37 Fix texture names. 2010-09-27 20:53:52 +09:00
Bill Currie
530ed45655 Get the timing write for when to restore the rects. 2010-09-27 19:42:28 +09:00
Bill Currie
9d316bd82a A bit more code cleanup. 2010-09-26 22:45:26 +09:00
Bill Currie
d894034ab1 Replace PS*instance.
It's a little flakey (doesn't always do the right thing), but it's a good
start. I'd like to do much smaller rectangles, and get the timing right.
2010-09-26 22:43:24 +09:00
Bill Currie
35c7916c28 Get the inspector button mostly working thanks to Deek's help. 2010-09-26 16:26:12 +09:00
Bill Currie
36342da9bd Rectirect Sys_Printf's output to the command output box. 2010-09-26 16:24:00 +09:00
Bill Currie
610f32e334 Fix a string comparision mistake.
This snuck in with the parser changes.
2010-09-26 13:50:21 +09:00
Bill Currie
994469fe01 Fix an uninitizized variable. 2010-09-26 13:50:21 +09:00
Bill Currie
1875a9d500 Work around a method type mismatch in GNUstep. 2010-09-26 13:50:21 +09:00
Bill Currie
1235c3b650 Hopefully fix the flush control and second screen placement. 2010-09-26 13:50:21 +09:00
Bill Currie
d87b338b4e Get help working (for what it is worth). 2010-09-26 13:50:21 +09:00
Bill Currie
b48ce84449 Remove debugging code. 2010-09-26 13:50:21 +09:00
Bill Currie
b141de8d09 Do not use PS* functions. 2010-09-26 13:50:21 +09:00
Bill Currie
940d9613f5 Get TextureView working. 2010-09-26 13:50:21 +09:00
Bill Currie
3c33652dae Get the Z checker working. 2010-09-26 13:50:21 +09:00
Bill Currie
f1c49a6382 KeypairView now seems to work properly. 2010-09-26 13:50:21 +09:00
Bill Currie
1561eac7a4 Don't change the font size when scaling the views.
This keeps the displayed size of the text constant (text size is independent of bounds/frame scaling)
2010-09-26 13:50:21 +09:00
Bill Currie
1262dee2eb Get the keyboard controls working. 2010-09-26 13:50:21 +09:00
Bill Currie
f7fbb663fb Modernize the camera eye glyph drawing. 2010-09-26 13:50:21 +09:00
Bill Currie
b2eb4020d5 Get scaling working in the Z view as well. 2010-09-26 13:50:20 +09:00
Bill Currie
d4d8c50c85 Finally have the scaling working perfectly(?).
I had to hack around problems in GNUstep's bounds implementation (I don't
know if they're bugs or design limitations), but the fix was just a matter
of making sure the bounds matrix was correct: force the scale to 1 before
adjusting bounds, and then make sure the translation is scaled afterwards.
2010-09-26 13:50:20 +09:00
Bill Currie
ad0cd004b7 Get scale changes halfway working.
Translation is still wrong, but changing scale to (eg) 200% and back to
100% works correctly.
2010-09-26 13:50:20 +09:00
Bill Currie
380460be82 slow progress in getting things to work 2010-09-26 13:50:20 +09:00
Bill Currie
e5625e169e Get textures sortof displaying. 2010-09-26 13:50:20 +09:00
Bill Currie
5f99251577 Correct alert panel handling. 2010-09-26 13:50:20 +09:00
Bill Currie
f049f9815c Get the textureView connection right. 2010-09-26 13:50:20 +09:00
Bill Currie
c85a0b2f25 Don't segfault when unable to open a file. 2010-09-26 13:50:20 +09:00
Bill Currie
25798e3c35 Get the sizes of the inspectors reasonable.
The inspector popup button is funky (need to select the desirned inspector
twice), but it can be made to work.
2010-09-26 13:50:20 +09:00
Bill Currie
2e30db9888 Get the inspectors showing.
Still can't change them via the pop-up menu, though.
2010-09-26 13:50:19 +09:00
Bill Currie
3af9f1b9f2 Accidently commited a failed experiment. 2010-09-26 13:50:19 +09:00
Bill Currie
077def90f6 Finish the gorm file, for certain values of finished. 2010-09-26 13:50:19 +09:00
Bill Currie
6ede64c663 Camera view seems to work moderately well. 2010-09-26 13:50:19 +09:00
Bill Currie
27ad18de3d Entity loading from maps seems to work. 2010-09-26 13:50:19 +09:00
Bill Currie
60d46127f8 Use QF's wadfile support.
Still fragile, but it can load wad files.
2010-09-26 13:50:19 +09:00
Bill Currie
692d4b9dae Get QUAKED comments working. 2010-09-26 13:50:19 +09:00
Bill Currie
37c2e0937c Get progs source scanning working.
Of course, this is if the environment is set up just right, but it's
another step towards something to fix.
2010-09-26 13:50:18 +09:00
Bill Currie
7b03cd49dc A little more progress: loading a map does not seg. 2010-09-26 13:50:18 +09:00
Bill Currie
eba4402d8e Get map loading sort-of working.
Segfaults, but the Map class can now be instantiated.
2010-09-26 13:50:18 +09:00
Bill Currie
68a55eaf8d Get some screen updates happening. 2010-09-26 13:50:18 +09:00
Jeff Teunissen
2d403391b5 correct fix for ForgeBundle protocol issue 2010-09-26 13:50:18 +09:00
Jeff Teunissen
f980ae0558 Update makefile's add'l install dirs
This rule would create the raw path /Library/Forge three times...fix it to
create Forge dirs with the new scheme.
2010-09-26 13:50:18 +09:00
Bill Currie
f5169fae80 Add \n to Sys_Printf calls. 2010-09-26 13:50:18 +09:00
Bill Currie
923f977835 Make the menus and do some connections. 2010-09-26 13:50:18 +09:00
Bill Currie
3eadc28c7f Make it run.
Fix some bad memory handling in XYView and ZView, and remove the unset
CustomView.
2010-09-26 13:50:18 +09:00
Bill Currie
e4f78ab80b Fixes for building with QF. 2010-09-26 13:50:18 +09:00
Bill Currie
8ffe20ee82 Again, whitespace. 2010-09-26 13:50:18 +09:00
Bill Currie
4d3cd613df For now, build an app rather than a bundle. 2010-09-26 13:50:18 +09:00
Bill Currie
0a9a42e67b Fix some bitrot.
I'm not happy with the fix in Controller.m, but I'm not sure what the best
way to fix it is.
2010-09-26 13:50:18 +09:00
Bill Currie
83182dc218 Initial Gorm file for MapEdit. 2010-09-26 13:50:18 +09:00
Bill Currie
0f426c1c5a Whitespace. 2010-09-26 13:50:18 +09:00