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
8893 commits 17 branches 20 tags 29 MiB
Commit graph

8893 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ozkan Sezer
6e04fd5ff6 signed int viddef_t members 
The attached patch (against quakeforge git) changes the [con]width,
[con]height, and most importantly the rowbytes members of viddef_t
from unsigned to signed int, like in q2.  This allows for a properly
negative vid.rowbytes which may be needed in, e.g. a DIB sections
windows driver if needed.  Along with it, I changed a few places
where unsigned int is used along with comparisons against the relevant
vid.* members.
One thing I am not 100% sure is the signedness requirements of
d_zrowbytes and d_zwidth: q2 has them as unsigned but I am not sure
whether that is because they are needed as unsigned or it was just an
oversight of the id developers. They do look like they should be OK
as signed int to me, though: comments?

==
Note from Bill Currie: I had to do some extra changes as many
signed/unsigned comparisons were somehow missed.
 2012-10-21 09:00:50 +09:00
Bill Currie
eccc1b5b51 Put the over-size range back to its original value. 
This fixes the horribly different results between optimized and unoptimized
qfbsp (there is still a difference of 1 brushface). Unfortunately, it also
severely limits the maximum size of a map.
 2012-09-18 09:25:10 +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
709da6e7d7 Rotate the skybox -90 degrees on the z axis (gl) 
Now gl and glsl match again, and quake's skies are now "correct" (assuming
fitzquake is the standard).
 2012-09-13 08:36:28 +09:00
Bill Currie
14f089d08e Correct the orientation of the skybox (for glsl). 
It turns out the expected orientation of the sky cube is exactly that of
Blender's default cube looked at from the front view (num-1) and the front
face being the nearest face. This put's Marcher's sun nicely in the view
when exiting the cave.
 2012-09-12 19:06:07 +09:00
Bill Currie
536ee48a97 Some minor skybox improvements suggested by mh. 
Rearrange the sky_suffix and sky_coords arrays and remove the sky_target
array such that the faces can be loaded using
GL_TEXTURE_CUBE_MAP_POSITIVE_X + i (apparently certain drivers break if
the faces aren't loaded in the correct order).

Also, the nomalization of the direction vector in the fragment isn't
necessary.
 2012-09-12 15:20:35 +09:00
Bill Currie
433d9d138b Hook up the pointfile loader in glsl. 
I was always wondering what that was for (never bothered looking at the
command registration, I guess :P).
 2012-09-12 09:54:24 +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
45c48a6215 Fix bsp2 loading. 
Just some problems with the handling of extended bsp29 files. I'm not
quite happy with the code, but it will do for now.
 2012-09-08 09:41:00 +09:00
Bill Currie
cfb856b9cf Fix byteswapping of a node's firstface/numfaces. 
I'd forgotten to fix this.
 2012-09-08 09:38:22 +09:00
Bill Currie
beb0b9e0fc Fix a segfault when no interfaces are available. 2012-09-08 09:37:48 +09:00
Bill Currie
0ce32a793e Return the correct size for set_bsp*_write(). 
Need to subtract the size of the bsp_t/bsp29_t struct. Now old and new
qfbsp produce identical bsps (so long as they're both unoptimized, or
(probably) both optimized).
 2012-09-07 20:42:04 +09:00