qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-27 14:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
8996 commits 17 branches 20 tags 29 MiB
Commit graph

2715 commits

Author SHA1 Message Date
Bill Currie
96110a0f54 Treat messages to id and Class separately. 
As id and Class do not point to real objects as such, trying to get the
class from their types doesn't work, so instead send the message to a
"null" class that skips the method checks.
 2012-11-11 17:39:12 +09:00
Bill Currie
ee28f3869c Fix the checking for assignments between id and Class. 
With Class now being struct obj_class rather than an actual class or
object, checking for Class now needs to be explicit.
 2012-11-11 17:24:33 +09:00
Bill Currie
694b268f53 Correct the type of id. 
It should be struct obj_object * rather than Object *.
 2012-11-11 17:22:57 +09:00
Bill Currie
35a88d873c Rework the builtin class creation once again. 
Now the classes are built "properly" (using the same tools as the parser
itself), and the structs (obj_object, obj_class and obj_protocol) are built
separately, but using the class ivars.
 2012-11-11 16:23:04 +09:00
Bill Currie
b36bd3a988 Remove the list offsets from the class ivars. 
Even just before, type_obj_object, type_obj_class and type_obj_protocol
were a bit bogus (still are), but now the arrays used to list their ivars
are correct. I plan to create the above mentioned types using
class_to_struct to do it properly.
 2012-11-11 09:52:55 +09:00
Bill Currie
0cf16ac558 Make _OBJ_CLASS_foo the correct type. 
It needs to be type_obj_class, but I had gotten confused earlier when
rearranging the type names as I was having trouble with "not a class"
errors.
 2012-11-10 13:45:38 +09:00
Bill Currie
06fd912a09 Make super_class for the internal Protocol and Class objects. 
They're based on Object, and that needs to be represented properly.
 2012-11-10 13:01:56 +09:00
Bill Currie
86091856be Revamp the static class creation. 
Type names are cleaned up, as is the creation. Also, the class pointer in
the type encoding now gets emitted. However, Still need to actually create
_OBJ_CLASS_Class and fix the type encoding reloc handling in the linker.
 2012-11-10 12:56:19 +09:00
Bill Currie
d33d062bd1 Rearrange class_message_response. 
Even if an object doesn't seem to respond to a message, return the message
so unrelated warnings or errors don't occur.
 2012-11-09 19:18:09 +09:00
Bill Currie
fd8c639773 Initialize current_symtab early, with pr.symtab. 
This (with the previous commit) fixes the problems with the tags for
builtin structs.
 2012-11-09 14:37:28 +09:00
Bill Currie
9cb0ca6fed Catch symtab operations with an invalid symtab. 
Just via a simple segfault, but it's better than silently missing incorrect
usage.
 2012-11-09 14:36:19 +09:00
Bill Currie
49cc4fed0c Give the builtin structures proper tags. 
With the previous commit, the structures were being created before a valid
source file name was available and thus qfcc would segfault when trying to
generate a tag. Now, the tags look better anyway :).
 2012-11-09 14:00:10 +09:00
Bill Currie
9fd8741b4f Move the state clearing into InitData. 
Now, for each compilation, or before linking, only InitData needs to be
called. Fixes the double chaining internal error when compiling and linking
in the same command.
 2012-11-09 13:56:45 +09:00
Bill Currie
f307c7bebc Rework the unary_expr grammar to allow ++*foo. 
This required throwing out the primary rules that snax did up to help me
with conflicts many years ago, but they were now getting in the way. Now
the productions from primary are merged in with unary_expr.
 2012-11-09 12:32:38 +09:00
Bill Currie
6ff2644ab5 Fix simple pointer dereferences. 
It turns out no code was being generated for x = *y. Ouch. I suspect I need
to take a better look at expr_deref at some time in the not too distant
future.

Conflicts:
	tools/qfcc/source/statements.c
 2012-11-09 12:32:35 +09:00
Bill Currie
7a2f7e8982 Add some safety checks to progs global dumping. 
Getting segfaults in the debug tools is not fun :P

Conflicts:
	tools/qfcc/source/dump_globals.c
 2012-11-09 12:30:14 +09:00
Bill Currie
cc24e2e67e Initialize global string vars correctly. 
Ouch, I'd fixed that for arrays, but not normal vars.
 2012-11-09 12:23:04 +09:00
Bill Currie
9095e1eabc Rework build_switch to use initialize_def. 
This required support for label reference expressions, whose purpose is to
represent the address of a label.
 2012-11-09 12:22:34 +09:00
Bill Currie
48fe9f729d Add partial support for pointer arithmetic. 
Only pointer +/- integral is supported. pointer - pointer will come later.
 2012-11-09 12:21:45 +09:00
Bill Currie
afbab60c25 Create linker_find_def. 
It turns out I didn't need it, but it could be useful in the future, so
I'll leave it in.
 2012-11-09 11:57:06 +09:00
Bill Currie
4ef4711c3b Make the type encodings findable. 
The base of the type encodings block is given by the .type_encodings def.
The block begins with a "null" type (4 words of 0), followed by the first
type encoding.

At some stage, I will need to add information for extended def information
(32 bit offset, type encoding, other?), but this is good for initial
testing.
 2012-11-09 11:43:19 +09:00
Bill Currie
1d060d1ac1 Quote string values when dumping globals. 
Much nicer :)
 2012-11-08 21:13:24 +09:00
Bill Currie
eb86a66ce5 Do some class object type renaming. 
type_object -> type_obj_object
type_Class -> type_obj_class
type_ClassPtr -> type_Class

In the process, one more FIXME is gone :)
 2012-11-08 20:58:48 +09:00
Bill Currie
377f8f9d56 Use an explicit flag for class initialization. 
Much cleaner than messing with class_Class, which is about to go away.
 2012-11-08 17:14:33 +09:00
Bill Currie
7e293a38e8 Check for double-chaining of types. 
Chaining a type twice will form a loop in the type list, causing find_type
to go into an infinite loop.
 2012-11-08 17:14:33 +09:00
Bill Currie
950a3aa83d Avoid infinite recursion when encoding struct types. 
Structures (especially hard-coded ones) can be really nasty as they can
refer to themselves. Avoid the recursion by setting the type_def field of
the type before doing the recursive encodings in the structure encoder.
 2012-11-08 17:06:38 +09:00
Bill Currie
7a25283beb Clear out the type encoding def from all types. 
The encodings of static types were getting corrupted because their defs
were not necessarily in the same places between compilations when compiling
multiple files.
 2012-11-08 17:06:38 +09:00
Bill Currie
a3a22f2a1b Add the ability to dump qfo type encoding. 2012-11-08 17:06:38 +09:00
Bill Currie
09d1cd61f3 Don't convert a qfo to progs unnecessarily. 
This avoids segfaults on reloctions for external defs.
 2012-11-08 17:06:29 +09:00
Bill Currie
61ef901254 Tweak some FIXMEs. 2012-11-08 17:03:02 +09:00
Bill Currie
ed4018fd8d Clear out the function overloading tables between compiles. 
Fixes some issues with multiple compiles (especially mixed languages!).
 2012-11-01 20:53:33 +09:00
Bill Currie
ea34a5b753 Fix some nasty memory errors. 
Three cheers for valgrind!!!
 2012-11-01 20:53:28 +09:00
Bill Currie
5c79953a7e Put quotes around strings for statement operands. 
This makes reading output a bit easier (especially if the string is empty
or just whitespace).
 2012-10-30 12:31:28 +09:00
Bill Currie
f8bdd909cc Separate out C and html quoting into separate functions. 
Dot sometimes wants normal C quotes, othertimes html. Quite annoying,
really, but this is cleaner anyway.
 2012-10-30 12:31:22 +09:00
Bill Currie
f680521e0f Escape unprintable chars. 2012-10-27 11:45:51 +09:00
Bill Currie
ec42bde527 Make hash tables more const correct. 
And clean up the resulting mess :/
 2012-10-27 11:44:31 +09:00
Bill Currie
034139b806 Move some code around so it's more accessible. 2012-10-27 11:43:29 +09:00
Bill Currie
7519ec7bbd Fix the bogus missing return warning. 
Pascal's return mechanism is such that void return is always used.
 2012-10-26 20:11:38 +09:00
Bill Currie
3f351a5c88 Fix a printf format goof. 
Forgot to compile test :/
 2012-10-26 19:38:59 +09:00
Bill Currie
52b9721027 Add the COMMA token to the pascal parser. 
I guess I forgot I needed to keep token numbers in sync between pascal and
qc/ruamoko.
 2012-10-26 19:06:10 +09:00
Bill Currie
72045f1a5b Delay storage setting for pascal functions. 
The function def must not be local. This fixes the null function call in
gcd.pas.
 2012-10-26 19:03:00 +09:00
Bill Currie
27b83a8d65 Clean up all extra aborts, using internal_error instead. 
Some internal_error calls have no message, but at least things will be more
consistent.
 2012-10-26 19:02:02 +09:00
Bill Currie
5530e84ada Call find_type for pascal functions/procedures. 
The result of parse_params needs to be passed through find_type before
actually being used. I guess I'd missed this back when I got things working
for qc.
 2012-10-26 16:20:57 +09:00
Bill Currie
144387c3e3 Add shared.h to the dist files. 2012-10-26 16:16:46 +09:00
Bill Currie
f14d8060e0 Merge qfpc into qfcc. 
Since gnu bison and flex are required anyway, no harm in using their api
prefix options. Now, qfcc can compile both QC/Ruamoko and Pascal files
(Pascal is (currently?) NOT supported in progs.src mode), selecting the
language based on the extension: .r, .qc and .c select QC/Ruamoko, .pas and
.p select Pascal, while anything else is treated as an object file (as
before).
 2012-10-26 16:01:41 +09:00
Bill Currie
50b22ab163 Fix a rather silly snafu with smart-leak. 
I blame this fever :P

Now smart-leak actually makes sense.
 2012-09-18 07:48:39 +09:00
Bill Currie
45fd312133 Merge branch 'master' into mapedit 2012-09-17 07:52:42 +09:00
Bill Currie
156f3382a5 Emit the points in the expected order. 
Associating p1 with n2 and p2 with n1 was a bit confusing. Makes for a
more-sensible points output file, too.
 2012-09-16 13:51:42 +09:00
Bill Currie
0ed535214e Import leak points files. 2012-09-16 12:57:17 +09:00
Bill Currie
d6476d4f93 Make some improvements to the leak files. 
smart leak files now produce many points, not just one per portal. Normal
leak files now center the trail on the portal (instead of some weird
weighted average).
 2012-09-16 12:38:55 +09:00
Bill Currie
4fc9316320 Add very preliminary support for map exporting. 
There is no error checking, texture alignment or support for non-point
lights, but it's a start. Also, it's assumed all brushes are convex and
manifold.
 2012-09-16 10:59:47 +09:00
Bill Currie
6b8df7f42a Give EntityClassDict mapping access functions. 
They just redirect to the actual entity class dictionary, but it saves a
lot of unnecessary code elsewhere.
 2012-09-16 10:55:06 +09:00
Bill Currie
8416276cee Remove a debug print. 2012-09-13 18:14:29 +09:00
Bill Currie
2760055a0f Try to speed up entity relationship drawing a little. 2012-09-13 13:14:32 +09:00
Bill Currie
559add50cb Fix some snafus. 2012-09-13 12:22:05 +09:00
Bill Currie
f18a926616 Add support for RMQs QUAKED comments. 
RMQ just leaves out the entity size instead of using ? for brush entities.
 2012-09-13 12:21:06 +09:00
Bill Currie
225cb4b364 Create an idquake character encoding. 
It just does a 1:1 charmap conversion of quake text, purely to allow python
to read arbitrary qc code.
 2012-09-13 12:19:26 +09:00
Bill Currie
bcda96a445 Report the source line of the entity in messages. 
For now, just when PrintEntity is used to print the message, but having the
first line of the entity sure makes life easier.
 2012-09-12 08:33:44 +09:00
Bill Currie
db25d5597d Handle quest format brushes. 
Bah, I forgot I needed to fix the vertex count parsing when I did the
script lexing change.
 2012-09-12 08:24:17 +09:00
Bill Currie
b764cad483 Add buttons to re-scan or re-parse entity class data. 2012-09-12 08:14:10 +09:00
Bill Currie
592222aba8 Don't attempt to draw a connecting line to a missing target. 2012-09-11 15:01:43 +09:00
Bill Currie
154d08a9c7 Gracefully handle unknown entity classes. 
Unfortunately, the classname gets lost to blender at this stage, but I have
an idea for how to handle that.
 2012-09-11 14:58:56 +09:00
Bill Currie
54832740c8 Gracefully handle missing textures. 
The texinfo still gets a material, but just an untextured one. The idea is
such textures can be fixed up at a later date.
 2012-09-11 14:57:24 +09:00
Bill Currie
41004fd7c2 Remove specularity from the brush materials. 
Specularity looks ghastly when there's nothing for it to highlight.
 2012-09-10 19:24:47 +09:00
Bill Currie
7204f8d90d Minor robustness improvements to map importing. 
Allow map parse errors to be reported propertly (the raise was for
debugging) and give up gracefully when the wad file can't be found.
 2012-09-10 19:23:15 +09:00
Bill Currie
995547ae6f Display a message for entity class parsing errors. 
It's hacky, but at least something shows up.
 2012-09-10 16:14:32 +09:00
Bill Currie
25e545616a Create EntityClassError exception. 
Much more useful than Python's SyntaxError (and much less confusing).
 2012-09-10 15:57:50 +09:00
Bill Currie
ae942afe5c Bind map_error to the script object. 
This works much better :)
 2012-09-10 14:59:43 +09:00
Bill Currie
f525be0880 Implement Script.error properly. 
It's not good to get an attirbute error when trying to raise another error.
 2012-09-10 14:58:41 +09:00
Bill Currie
dade60863e Move the entity class comment into its own box. 
Blender doesn't support multiline text or word wrapping, so the tooltips
were rather ugly. The double spacing used by layout.label() is still a
little ugly, but the resulting text box just below the entity classname is
much more usable.
 2012-09-10 13:19:38 +09:00
Bill Currie
198a49dfdf Ensure all files have the gpl block. 2012-09-10 12:40:55 +09:00
Bill Currie
a75fe213a6 Make entity lines post rather than pre. 
I'm not sure what visual difference it makes, but it is pretty much what
I'd intended in the first place.
 2012-09-10 12:16:23 +09:00
Bill Currie
2905cb69bc Add entity relation lines. 
It has many problems (eg, the lines won't update when target/targetname
change), but the basics are working.
 2012-09-10 11:48:22 +09:00
Bill Currie
9dc1039686 Fix map parsing for quest format maps. 
Bah, the one place a single char lex is needed :P
 2012-09-10 08:08:37 +09:00
Bill Currie
da6f57a23b Get entity field key/value pair editing working. 2012-09-10 08:08:11 +09:00
Bill Currie
ea541b325d Set the map parser scripts to not lex single chars. 
qbsp treats {foo as one token, not two.
 2012-09-09 17:23:55 +09:00
Bill Currie
c8be8c242a Don't use any single chars for maps. 
The standard map format (original qbsp) doesn't use them.
 2012-09-09 17:13:10 +09:00
Bill Currie
0c2818c038 Ensure the texture scaling is never 0. 2012-09-09 17:12:45 +09:00
Bill Currie
73cdd66c52 Set the entity properties as parsed from the map. 2012-09-09 17:11:57 +09:00
Bill Currie
825ce0dad6 Make the type of EntityClass.flagnames consistent. 
Sometimes list and sometimes tuple makes for a mess.
 2012-09-09 17:01:23 +09:00
Bill Currie
709ab05713 Add preliminary support for entity properties. 
Only classname and flags are supported right now, and only classname gets
set when the entity is added (via the add menu).
 2012-09-09 13:22:52 +09:00
Bill Currie
468f96902f Use a tetrahedron for the default brush entity. 
It seems to be a reasonable shape to show that editing is needed.
 2012-09-09 11:10:03 +09:00
Bill Currie
18fcdb0ce7 Implement the add_entity operator. 
Doesn't work for brush entities yet.
 2012-09-09 10:29:43 +09:00
Bill Currie
fde8d29899 Use icons to distinquish brush ents from others. 
Mesh-data icons indicate brush entities, object-data icons indicate the
others.
 2012-09-09 09:29:55 +09:00
Bill Currie
06fd951a55 Build the add entity menu tree. 
The menu tree is built from the parsed entity classes, with _ forming the
separator between menu levels.
 2012-09-09 08:54:41 +09:00
Bill Currie
a37c5465e1 First step for BSP2 support. DOES NOT WORK! 
All of the nastiness is hidden in bspfile.c (including the old bsp29
specific data types). However, the conversions between bsp29 and bsp2 are
implemented but not yet hooked up properly. This commit just gets the data
structures in place and the obvious changes necessary to the rest of the
engine to get it to compile, plus a few obvious "make it work" changes.
 2012-09-07 16:09:24 +09:00
Bill Currie
395a0eef78 Don't use targetname for entity names. 
Proves to be rather non-useful (at this stage, anyway)
 2012-09-04 20:29:00 +09:00
Bill Currie
1993ee8352 Remove some debug prints. 2012-09-04 19:40:07 +09:00
Bill Currie
af37ae438e Fix the incorrectly rotated textures. 
map uses degrees, blender uses radians. oops.
 2012-09-04 19:39:10 +09:00
Bill Currie
7feec96b8d Texture the world :) 
Such a simple statement for a sizable hunk of work.
 2012-09-04 17:04:30 +09:00
Bill Currie
b29f24e6d3 Add a wadpath scene property and load the wad files. 2012-09-04 17:04:00 +09:00
Bill Currie
95e2a5b21a Pre-process texture defs. 
The st-vectors are now fully calculated as per qfbsp's algorithm.
The Texinfo class tries to create unique texture defintions.
 2012-09-04 16:59:02 +09:00
Bill Currie
446016e84e Make wad contents searches case-insensitive. 2012-09-04 16:58:19 +09:00
Bill Currie
8587079c0d Fix a case&paste error. 2012-09-04 11:59:04 +09:00
Bill Currie
38facac7ce Add a very simple wad reader. 
It supports only MipTex data (for automatic data conversion), and it's very
fragile, but it will do for now.
 2012-09-03 19:37:04 +09:00
Bill Currie
125952d17d Un-hardcode the light distance. 2012-09-03 14:34:27 +09:00
Bill Currie
dfaf28001a Create colored boxes for sized entity classes. 
The data is taken from the parsed entity class data. No error checking is
done yet.
 2012-09-03 14:33:32 +09:00
Bill Currie
16952ffbbb Support loading entity class data into blender. 
The qc source path is specified via the dirpath property in the QF Entity
Classes panel of the scene data. The scanned entity classes are stored in a
plist in a blender text file for persistent storage (so the directory
doesn't need to be scanned every time). Also, so the data doesn't have to
be parsed every time, the data is stored in a normal python class hanging
off the properties class (evil hack?).
 2012-09-03 13:38:28 +09:00
Bill Currie
3cad0f978b Revamp entity class loading for blender integration. 
Slightly cleaner EntityClass building, and now the directory scanner is
part of the EntityClassDict class, which also supports reading/writing
plists (for persistent storage in blender).
 2012-09-03 13:35:18 +09:00
Bill Currie
b3e5083f60 Add a symlink to io_mesh_qfmdl's qfplist.py 
The map editor addon needs to use it too, but I don't want to duplicate the
file in git.
 2012-09-03 13:33:59 +09:00