Commit Graph

1831 Commits

Author SHA1 Message Date
Bill Currie b28ba46448 Fix wad loading when loading the map.
This broke with the fix for the entity inspector.
2010-11-28 15:31:38 +09:00
Bill Currie da2c87f964 Use QF's property lists for the project file. 2010-11-28 15:31:38 +09:00
Bill Currie 24fad619d1 First step in cleaning up Dict. 2010-11-28 15:31:38 +09:00
Bill Currie 5c0fb3ecd3 Correct an error message. 2010-11-28 15:31:38 +09:00
Bill Currie 6c96402403 Get the button icons set properly.
There are still issues with the way gorm does things, but this works for
now.
2010-11-28 15:31:38 +09:00
Jeff Teunissen 602564075d install images into Resources
Install the button icons into the app when we make it.
2010-11-28 15:31:38 +09:00
Jeff Teunissen edf5f6e018 find $GNUSTEP_MAKEFILES
Enable locating the GNUstep makefiles using the various schemes available
(in order of reliability), eventually reaching a hardcoded default.
2010-11-28 15:31:38 +09:00
Jeff Teunissen 0e5cd14829 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-11-28 15:31:38 +09:00
Jeff Teunissen a4eec40843 Remove -read:/-write from Storage
Apparently GS doesn't do TypedStream any more...
2010-11-28 15:31:38 +09:00
Jeff Teunissen cdc79ae6f8 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-11-28 15:31:38 +09:00
Jeff Teunissen 7dc5d26480 SetBrush: signed/unsigned fix 2010-11-28 15:31:37 +09:00
Jeff Teunissen dbab1545e5 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-11-28 15:31:37 +09:00
Jeff Teunissen 4d63d20663 signed/unsigned and some const-correctness 2010-11-28 15:31:37 +09:00
Bill Currie 646422d683 Get the timing right when setting the wad file in worldspawn. 2010-11-28 15:31:37 +09:00
Bill Currie 939605309f Do error checking when trying to load a wad file. 2010-11-28 15:31:37 +09:00
Bill Currie 997df6c310 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-11-28 15:31:37 +09:00
Bill Currie 1b7be81f11 Do a const-correct run. 2010-11-28 15:31:37 +09:00
Bill Currie 62c73b300e 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-11-28 15:31:37 +09:00
Bill Currie 3574668fe3 Connect the region filtering switch.
Region filtering now seems to work. Also added a tool tip.
2010-11-28 15:31:37 +09:00
Bill Currie d8773fddb1 Get the entity flags switches into the right initial stage. 2010-11-28 15:31:37 +09:00
Bill Currie 68190bd431 Echo the output to stdout as well as the output box. 2010-11-28 15:31:37 +09:00
Bill Currie 1aae3c8174 Get the inspector button displaying properly. 2010-11-28 15:31:37 +09:00
Bill Currie bb3ea99806 Fix texture names. 2010-11-28 15:31:36 +09:00
Bill Currie dcc4187a8c Get the timing write for when to restore the rects. 2010-11-28 15:31:36 +09:00
Bill Currie 9cc66c3de1 A bit more code cleanup. 2010-11-28 15:31:36 +09:00
Bill Currie 1e6cdb4bb8 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-11-28 15:31:36 +09:00
Bill Currie 73a82342db Get the inspector button mostly working thanks to Deek's help. 2010-11-28 15:31:36 +09:00
Bill Currie 7c3e6b8bdc Rectirect Sys_Printf's output to the command output box. 2010-11-28 15:31:36 +09:00
Bill Currie 3a6e5ea179 Fix a string comparision mistake.
This snuck in with the parser changes.
2010-11-28 15:31:36 +09:00
Bill Currie 4ed7290d9f Fix an uninitizized variable. 2010-11-28 15:31:36 +09:00
Bill Currie cfa13f1caa Work around a method type mismatch in GNUstep. 2010-11-28 15:31:36 +09:00
Bill Currie c1fac2cc8a Hopefully fix the flush control and second screen placement. 2010-11-28 15:31:36 +09:00
Bill Currie ec98bb3b93 Get help working (for what it is worth). 2010-11-28 15:31:36 +09:00
Bill Currie 4b1202d6e6 Remove debugging code. 2010-11-28 15:31:36 +09:00
Bill Currie 73b89ba0b8 Do not use PS* functions. 2010-11-28 15:31:36 +09:00
Bill Currie 4dd0bf5804 Get TextureView working. 2010-11-28 15:31:35 +09:00
Bill Currie 950af620bc Get the Z checker working. 2010-11-28 15:31:35 +09:00
Bill Currie 6509a24a54 KeypairView now seems to work properly. 2010-11-28 15:31:35 +09:00
Bill Currie c0236955f2 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-11-28 15:31:35 +09:00
Bill Currie 6be1f516f6 Get the keyboard controls working. 2010-11-28 15:31:35 +09:00
Bill Currie 27fdf21120 Modernize the camera eye glyph drawing. 2010-11-28 15:31:35 +09:00
Bill Currie 91751d9fbb Get scaling working in the Z view as well. 2010-11-28 15:31:35 +09:00
Bill Currie a0201728d9 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-11-28 15:31:35 +09:00
Bill Currie e2f8490f9a Get scale changes halfway working.
Translation is still wrong, but changing scale to (eg) 200% and back to
100% works correctly.
2010-11-28 15:31:35 +09:00
Bill Currie 7f5a68023b slow progress in getting things to work 2010-11-28 15:31:35 +09:00
Bill Currie a229f20525 Get textures sortof displaying. 2010-11-28 15:31:35 +09:00
Bill Currie e15b963279 Correct alert panel handling. 2010-11-28 15:31:35 +09:00
Bill Currie 0d5bd775cb Get the textureView connection right. 2010-11-28 15:31:35 +09:00
Bill Currie 752ff7d879 Don't segfault when unable to open a file. 2010-11-28 15:31:35 +09:00
Bill Currie 43d2d9645d 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-11-28 15:31:35 +09:00
Bill Currie 0de8e3806d Get the inspectors showing.
Still can't change them via the pop-up menu, though.
2010-11-28 15:31:34 +09:00
Bill Currie 3193374257 Accidently commited a failed experiment. 2010-11-28 15:31:34 +09:00
Bill Currie 7d5af7c341 Finish the gorm file, for certain values of finished. 2010-11-28 15:31:34 +09:00
Bill Currie b215a5e856 Camera view seems to work moderately well. 2010-11-28 15:31:34 +09:00
Bill Currie f8ce05d862 Entity loading from maps seems to work. 2010-11-28 15:31:34 +09:00
Bill Currie f6ebcd45ac Use QF's wadfile support.
Still fragile, but it can load wad files.
2010-11-28 15:31:34 +09:00
Bill Currie 972e98ec09 Get QUAKED comments working. 2010-11-28 15:31:34 +09:00
Bill Currie c820735dd3 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-11-28 15:31:34 +09:00
Bill Currie a2ab1c81ce A little more progress: loading a map does not seg. 2010-11-28 15:31:34 +09:00
Bill Currie 0e4259361c Get map loading sort-of working.
Segfaults, but the Map class can now be instantiated.
2010-11-28 15:31:34 +09:00
Bill Currie 4fdc34ea86 Get some screen updates happening. 2010-11-28 15:31:34 +09:00
Jeff Teunissen ef7492f5cf correct fix for ForgeBundle protocol issue 2010-11-28 15:31:33 +09:00
Jeff Teunissen 3dcfd69b50 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-11-28 15:31:33 +09:00
Bill Currie e959a6ee3c Add \n to Sys_Printf calls. 2010-11-28 15:31:33 +09:00
Bill Currie 9ffcc8658d Make the menus and do some connections. 2010-11-28 15:31:33 +09:00
Bill Currie 7f41d1529b Make it run.
Fix some bad memory handling in XYView and ZView, and remove the unset
CustomView.
2010-11-28 15:31:33 +09:00
Bill Currie 44942df87f Fixes for building with QF. 2010-11-28 15:31:33 +09:00
Bill Currie 9ec5310ed7 Again, whitespace. 2010-11-28 15:31:33 +09:00
Bill Currie 6500333e91 For now, build an app rather than a bundle. 2010-11-28 15:31:33 +09:00
Bill Currie f25754813e 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-11-28 15:31:33 +09:00
Bill Currie 81a3eaf93e Initial Gorm file for MapEdit. 2010-11-28 15:31:32 +09:00
Bill Currie b5f5ad6ce2 Whitespace. 2010-11-28 15:31:32 +09:00
Bill Currie 7ebb7c503b Remove unused file. 2010-11-28 15:31:32 +09:00
Bill Currie e93bb3fb69 Remove some redundant files.
Use the functions provided by QuakeForge.
2010-11-28 15:31:31 +09:00
Bill Currie e84574400d Can't use UserPath, so remove these. 2010-11-28 15:31:31 +09:00
Bill Currie 6e3df2c68d Possibly get preferences working. 2010-11-28 15:31:31 +09:00
Bill Currie 3e3d8cc9cd clean up some XXXs 2010-11-28 15:31:31 +09:00
Bill Currie c1e2d4c17a And the header files. 2010-11-28 15:31:31 +09:00
Bill Currie d23300d58b 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.
2010-11-28 15:31:31 +09:00
Bill Currie d3a12ee727 Finally, everything does compile.
However, it still won't work (no gorm, commented code, ...).

Borrow an old implementation of the Storage class until I figure out just
what it's being used for.
2010-11-28 15:31:31 +09:00
Bill Currie ddc493d657 Add the rest of the files which I know to build. 2010-11-28 15:31:31 +09:00
Bill Currie 767d871fb8 Make MapEdit (QuakeEd) compile.
It won't work yet as there's no gorm file and there's code that has been
commented out, but it finally compiles.
2010-11-28 15:31:31 +09:00
Bill Currie ac88c86dd3 Scripts now treat {}()': as single character tokens. 2010-11-28 15:31:30 +09:00
Bill Currie 032f16d1b3 Some compile fixes.
Not enough, but covers Object->NSObject and header file protection.
2010-11-28 15:31:30 +09:00
Bill Currie 023d3c89ec Source formatting. 2010-11-24 17:01:18 +09:00
Bill Currie 4518e6af91 First stab at implementing autorelease.
It's probably nowhere near right, but probably ok for now (I need to study
the GNUStep code). I'm unhappy with the menu code hook, but it will have
to do for now.
2010-11-24 17:01:18 +09:00
Bill Currie 5fc4ef63f6 Rewrite ruamoko plist support to use handles.
The plist code was written long before I thought of resource handles, and
then it was forgotten. This is much nicer and safer than storing C
pointers in progs memory space (*shudder*).
2010-11-24 17:01:18 +09:00
Bill Currie 9a3f4d5a01 Handle method parameters that use incomplete types.
Compare the method's type pointers rather than the type strings as the pointer
won't change with the struct is completed.
2010-11-24 17:01:18 +09:00
Bill Currie e28ee0378f Gracefully handle returning NIL though a bad type. 2010-11-24 17:01:18 +09:00
Bill Currie 67beaf4487 Nil is a constant, so allow it in global initializers. 2010-11-24 17:01:18 +09:00
Bill Currie 799d46f83d Check for incomplete types and better param/return size checking. 2010-11-24 17:01:17 +09:00
Bill Currie a623fb53a7 Proper support for empty structs and unions.
They now have a single private, void, unnamed member, resulting in a size of
1 word. This makes empty structs useful for typed opaque handles.
2010-11-24 17:01:17 +09:00
Bill Currie e5e560cbaf Ensure struct params are small enough to fit in the param slots. 2010-11-24 17:01:17 +09:00
Bill Currie 49ea878ad9 Slightly more informative progress.
Display per-thread current portal number. Will get messy if there are more threads than the screen width can handle.
2010-11-21 09:56:31 +09:00
Bill Currie 2ef291bf46 Make mdl.py work on 64 bit machines. 2010-10-18 17:53:04 +09:00
Bill Currie 0c4b2f9e19 Add the default extension when no output file is specified. 2010-10-16 22:09:18 +09:00
Bill Currie 98fa427456 Add the extract-hull option to the usage output. 2010-10-16 16:16:58 +09:00
Bill Currie 985c27b52d Some more brush documentation. 2010-10-13 20:52:08 +09:00
Bill Currie ef7958d680 Lots of const correctness. 2010-10-13 20:52:08 +09:00
Bill Currie f4bff1d3b0 Make some code more readable. 2010-10-13 20:52:08 +09:00
Bill Currie 16e067c8cb More portal documentation. 2010-10-13 20:52:08 +09:00
Bill Currie 538956c389 Make parts of CutNodePortals_r() easier to read. 2010-10-13 20:52:08 +09:00
Bill Currie 08c6a185ad Documentation for writebsp. 2010-10-13 20:52:08 +09:00
Bill Currie d90a630b04 Call AddAnimatingTextures only once rather than for every wad file. 2010-10-13 20:52:08 +09:00
Bill Currie fcd1897421 Create the qfbsp doxygen modules.
Also, make doxygen extract static functions as well, so qfbsp's docs can be
more complete.
2010-10-13 20:52:08 +09:00
Bill Currie bfc6c9e798 Document the smart-leak function. 2010-10-13 20:52:07 +09:00
Bill Currie 93517d40d8 Finish the port of smart leak files.
This comes from the OpenQuartz version of qbsp.
2010-10-13 20:52:07 +09:00
Bill Currie 142defe9c0 Parameter consistency fixes.
Make the params for FreeWinding and CopyWinding consistent with those in
qfbsp. This fixes some doxygen warnings while I think about how best to
handle the duplicate code.
2010-10-13 20:52:07 +09:00
Bill Currie ad8b08238d Make some vector code easier to read. 2010-10-13 20:52:07 +09:00
Bill Currie 44776f111f Documentation for winding. 2010-10-13 20:52:07 +09:00
Bill Currie a8bd522ca1 Documentation for tjunc. 2010-10-13 20:52:07 +09:00
Bill Currie f758cacc69 Make FindEdge easier to read. 2010-10-13 20:52:07 +09:00
Bill Currie fc0e0f4665 Documentation for surfaces. 2010-10-13 20:52:07 +09:00
Bill Currie f3e7a7ca89 Documentation for solidbsp. 2010-10-13 20:52:07 +09:00
Bill Currie 4b1b838f87 More braces and whitespace. 2010-10-13 20:52:07 +09:00
Bill Currie 313677ee96 Add some braces and a bit of whitespace 2010-10-13 20:52:07 +09:00
Bill Currie 69189600a4 Some docs for bsp5.h 2010-10-13 20:52:07 +09:00
Bill Currie 68dda63de5 Documentation for region. 2010-10-13 20:52:07 +09:00
Bill Currie 00b635236d Document the readbsp code. 2010-10-13 20:52:07 +09:00
Bill Currie 34d60539de Document the portals code. 2010-10-13 20:52:06 +09:00
Bill Currie cc098fa720 Documentation for outside. 2010-10-13 20:52:06 +09:00
Bill Currie a92bd6dec1 Document the merge code 2010-10-13 20:52:06 +09:00
Bill Currie 6ce7c5040b Make NewFaceFromFace const-correct 2010-10-13 20:52:06 +09:00
Bill Currie 6c89883c8f Lots of csg4 documentation 2010-10-13 20:52:06 +09:00
Bill Currie 17e5813a51 Make a block of code a little easier to read. 2010-10-13 20:52:06 +09:00
Bill Currie a5c96cb825 More documentation and move some functions. 2010-10-13 20:52:06 +09:00
Bill Currie 2e6eb419ca Some documentation for the map parser. 2010-10-13 20:52:06 +09:00
Bill Currie 5cf5c1e227 lots of whitespace 2010-10-13 20:52:06 +09:00
Bill Currie 5c0a55d818 Add some documentation for the brush code. 2010-10-13 20:52:06 +09:00
Bill Currie 9a4c9c506f Fix bbox calculation for rotating brush entities. 2010-10-13 20:52:06 +09:00
Bill Currie b91568bbdd More non-canonical checks in PlaneTypeForNormal. 2010-10-13 20:52:06 +09:00
Bill Currie c9eb679c41 Make PlaneTypeForNormal const-correct. 2010-10-13 20:52:06 +09:00
Bill Currie 7fca21837a fix some errors found by valgrind 2010-10-13 20:52:05 +09:00
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 e9bd9a4baa Move QFS_CreatePath() to Sys_CreatePath(). 2010-08-25 13:52:24 +09:00
Bill Currie a51e888a1b Nuke MAX_OSPATH and clean up the mess. 2010-08-25 13:31:08 +09:00
Bill Currie 06cbb941f1 "make dist" fixes
Since we're using git now, having a rule to make ChangeLog is reasonable.

Also, forgot the remove mention of qfcc.lsm.in when I nuked the file.
2010-08-21 13:09:53 +09:00
Bill Currie 1442273a8f more opaque correctness 2010-08-20 12:58:37 +09:00
Bill Currie 669771681a split up and modernize configure.ac
Most of the guts of configure.ac have been moved to config.d and are then
brought in by m4_include. This will make maintaining configure.ac much easier.

Also drop use of PROGRAM and VERSION, using PACKAGE_NAME, PACKAGE_VERSION, and
on occasion, PACKAGE_STRING instead, and clean out some old files we no longer
need.
2010-08-19 15:01:43 +09:00
Bill Currie a703956553 split up most of bsp5.h and get things compiling again 2010-08-18 17:52:13 +09:00
Bill Currie d045045693 get the grouping right 2010-08-11 23:42:14 +00:00
Bill Currie f04bc64ef1 clean up a bunch of doxygen warnings 2010-08-11 23:41:30 +00:00
Bill Currie 0dfff8fd58 ignore stuff 2010-08-07 10:42:09 +00:00
Bill Currie 7ef81cae31 and the rest of the changes before actually working on the new parser 2010-08-05 03:39:26 +00:00
Bill Currie 9a4258b5c5 rename "map" to "map_script" in anticipation of a better map parser 2010-08-05 03:30:13 +00:00
Bill Currie 17d84613a9 found a test file lurking around 2010-08-05 02:36:51 +00:00
Bill Currie 51a32f4f87 minor comment about scoping in traditional mode 2010-02-22 13:44:52 +00:00
Bill Currie fac98536f0 make sure def->space points to the space the def's location is allocated from to ensure that freeing the location works properly (fixes the bogus address triggered by prozaccoop: thanks, phrosty) 2010-02-22 13:11:41 +00:00