e25024c131
Build a single NLA track with strips for all actions.
...
This removes the need for fakeuser :).
Anyway, with this, the model's animations can be viewed all in sequence
just by hitting alt-a.
2012-04-16 15:42:49 +09:00
4b29510bfd
Set the name of the shape-key datablock to the model name.
...
Note that this is the data block that holds the list of actual shape-keys,
rather than the shape-keys themselves. I'm not sure what it's correct name
is (it's just "Key" in RNA).
I really dislike this method of setting the name, but the use of "Key" as
the datablock name is actually hard-coded into blender's C code :/
2012-04-16 13:33:45 +09:00
0952e918dd
Set fakeuser on actions.
...
Without fakeuser set, blender will toss out the actions on save and reload.
Converting to an nla strip might take care of that, but I haven't figured
out how to do that yet, so avoid any nasty surprised for the user.
2012-04-16 13:30:58 +09:00
70f500a087
Use custom properties for model flags etc.
...
Eye position, auto rotation, sync type and particle effects can now all be
edited in blender: both import and export do the right thing. The settings
can be found in the "QF MDL" panel of the "Object" tab of the properties
view.
2012-04-15 21:55:23 +09:00
92c08fb957
Update required blender version.
2012-04-15 13:47:59 +09:00
fd9b8f7b4a
Fix import and export for blender 2.63
...
Blender 2.63 should be out in a few days. Nice to get this ready ahead of
time.
2012-04-15 09:34:53 +09:00
d3af0b2357
Correct the MD16 writing code.
...
Forgot to test it :P
2012-04-15 09:34:16 +09:00
ab4aec47a7
Correct vertex scaling for blender 2.62+
...
This also abandons support for older versions of blender.
2012-04-14 18:10:25 +09:00
a3e53337b6
Put my blender struts script in a safe place.
...
Nothing to do with QF, but then again, it might be useful.
2012-02-22 17:47:16 +09:00
120f93e714
Fix a couple of missed edits from the previous commit.
2012-02-10 07:32:21 +09:00
eefa89e72e
Remove the AM_CONDITIONALs from tools.
...
Now that the tools directories aren't entered when those tools aren't being
built, there's no reason to use AM_CONDITIONAL in there.
2012-02-10 02:50:42 +09:00
4d6ed605a9
Create and use QF_PROCESS_NEED_DIRS.
...
Not that I imagine many people use --with[out]-tools, but now unwanted
tools don't get visited by make.
2012-02-10 01:49:45 +09:00
e34f0178b6
Build GLSL clients for SDL.
...
Just about to do a release, and I realized windows users wouldn't have any
way of checking out the new renderer. I'll add wglsl when I get a chance to
do some testing.
2012-02-08 22:05:58 +09:00
cc443c42e6
Update the cross-tools locations.
2012-02-08 21:10:43 +09:00
b59ffd4cf1
Fix win32 (mingw) builds.
2012-02-07 20:18:23 +09:00
9fbff2f4d5
Do an audit of the Makefile.am files.
...
o All instances of LIBADD/LDADD have a corresponding DEPENDENCIES
specificatiion.
o libraries now use a lib_ldflags macro to keep things consistent
o duplication of source/lib names has been minimized (particularly in
the libraries; more work needs to be done for the executables)
o automake spec blocks have been organized (again, more work needs to be
done for the executables)
2012-02-07 16:04:19 +09:00
f5eec3d930
Set all android envvars for make as well as configure.
...
Running make might trigger a reconfig, so the vars are always necessary.
2012-02-05 20:52:38 +09:00
d2a6da6c24
Set PKG_CONFIG_PATH to something reasonable.
...
Now libsamplerate can be detected.
2012-02-05 18:46:12 +09:00
459d6c3f2d
Add the final changes to get configure working for android.
2012-02-05 14:36:02 +09:00
c0f7b4ba37
Fix qfvis for android.
...
pthread_cancel is not (and will not be) implemented, so rework the thread
finalization to not need it.
2012-02-05 14:29:46 +09:00
5fdad1c79c
Support more than just mingw cross compiling.
...
This is the beginnings of android support :)
2012-02-05 11:34:11 +09:00
f8dfee6de7
Merge branch 'master' into glsl
2012-01-29 22:36:35 +09:00
1f3eaaf2e0
Fix the importer for blender 2.61.
...
The use_image field of faces disappeared somewhere between 2.59 and 2.61.
2012-01-23 23:10:25 +09:00
86a401b025
Fix the importer for blender 2.61.
...
The use_image field of faces disappeared somewhere between 2.59 and 2.61.
2012-01-22 19:23:02 +09:00
91cb875115
Add vertex loading/writing for MD16.
2012-01-05 16:49:42 +09:00
c8163fc0de
Add an option to prevent the use of default paths.
...
Despair has things locked down such that running qfcc during a build fails
due to lack of read access to /usr/local/lib. This is actually a good
thing as accidentally hitting old includes/libs (when a file gets deleted
in the tree) hides bugs. Thus, --no-default-paths to turn off default
search paths.
2012-01-04 13:53:04 +09:00
ffc9680653
Add an option to prevent the use of default paths.
...
Despair has things locked down such that running qfcc during a build fails
due to lack of read access to /usr/local/lib. This is actually a good
thing as accidentally hitting old includes/libs (when a file gets deleted
in the tree) hides bugs. Thus, --no-default-paths to turn off default
search paths.
2012-01-04 13:17:57 +09:00
59c621e0cf
Move qfprogs from tools to qfcc (packaging).
2011-12-25 16:23:02 +09:00
cc5140e3a1
Move min/max/bound and field_offset into better locations.
...
min/max bound into mathlib.h (they /are/ math functions, after all) and
field_offset into qtypes.h.
2011-12-24 10:04:33 +09:00
6ead583195
Ruamoko: Implement infinity.
...
The special token __INFINITY__, like __FILE__ and friends, will expand to
a floating-point expression containing a value the C compiler considers
infinite. Obviously, this assumes that the system has relatively modern
float hardware -- but if it doesn't, having Ruamoko be able to represent
float infinity is the least of your problems. :)
2011-12-14 12:20:10 -05:00
8516891329
Edit the package version when building a release.
2011-12-09 11:27:46 +09:00
853bf13d9e
Move the winding code into libQFmodels.
2011-11-28 20:54:35 +09:00
91e65b6c80
Rename mplane_t to plane_t and clean up the mess.
...
I got rather tired of there being multiple definitions of mostly compatible
plane types (and I need a common type anyway). dplane_t still exists for
now because I want to be careful when messing with the actual bsp format.
2011-11-28 20:54:34 +09:00
ea02f3cd44
Fix a missed byteswap when loading qfo files.
2011-11-15 17:36:55 +09:00
2457837b37
Make some improvements to the winding docs.
2011-11-12 12:17:45 +09:00
6b62b850a7
Add an option to omit the mipmap from extracted textures.
...
This is at the request of Spirit (quaddicted). Great idea.
2011-10-05 20:43:40 +09:00
3b8ab404a0
Add the ability to save the extra model parameters.
...
The params are eye position, flags and synctype. Provision is made for
reading them from a text block on export, but nothing is done other than
retrieving the text block.
2011-09-28 07:41:20 +09:00
521f482806
Fix an off-by-one error that caused uvs to wrap.
2011-09-25 20:52:28 +09:00
1277c17cd9
Give the 24-8 bit converter a massive speedup.
...
The biggest part of the speedup is reading from blender's image only once
(it seems that every read does so from GL rather than memory: ouch). Also,
cache the results for each color.
2011-09-25 20:50:32 +09:00
2e2484250c
Add some notes about modelgen's commands.
2011-09-24 21:31:02 +09:00
50795b8239
Calculate the model "size".
...
The size is actually the average area in quake units of the mesh's
triangles. Again, my results are slightly smaller (0.025).
With this, all calculable fields are set. Only eye position, flags and
synctype remain.
2011-09-24 13:18:23 +09:00
07b5db64c6
Calculate the bounding radius.
...
The calculated radius is a smidge (0.05) smaller than the original
(invisibl.mdl), but I think that's due to the difference in source data: id
used the original models, I'm using their output.
2011-09-24 13:03:18 +09:00
3b33d8dade
Make the basis shape key active on import.
...
Blender must have an active shape key before shape key animation will work.
This fixes the models being locked to the first frame until a shape key is
selected via the UI.
2011-09-24 11:43:06 +09:00
bd840726c2
Fix the mangled faces.
...
I /did/ see the warning about vertex index 0 in the obj importer script,
but I didn't take it seriously enough. This fixes both the twisted texture
on a couple of faces, and the truly mangled tris when exporting (using
invisibl.mdl for testing).
2011-09-24 09:00:14 +09:00
a1d9e752cd
Fix the messed up UVs.
...
I had forgotten to invert the t axis.
2011-09-23 19:58:26 +09:00
a80eef8bc4
Get the exporter mostly working.
...
There seems to be some problems with the UVs, only one frame is exported,
and various model params don't get set (eye position, size, bounding
radius, synctype, flags), but the size and shape look right in qf :).
2011-09-23 19:01:31 +09:00
8ccb07d959
Make the MDL classes a little more usable.
...
This really eased the writing of the exporter :)
2011-09-23 19:00:39 +09:00
8bec9cb203
Clean up export_mdl() a little.
2011-09-23 13:00:46 +09:00
4a3731652e
Fix the exported skin conversion.
...
I must remember to test language features in python 3 :P
2011-09-22 14:08:10 +09:00
40f46f2ea3
Complete mdl writing.
...
Except for the normal index in the frame bounds (and potentially frame
names with junk after the terminating nul), the output is identical to the
input for:
mdl=MDL().read("invisibl.mdl")
mdl.write("test.mdl")
2011-09-22 11:44:08 +09:00
e35dd29a2d
Don't use Vector in mdl.py
...
This will make testing of the MDL class a little easier (independent of
Blender).
2011-09-22 11:43:57 +09:00
a58f9582b0
Try to write out the skin.
...
Something's not working as all I get is a black texture, but the basics
(MDL writing) seem to be ok.
2011-09-22 00:58:57 +09:00
ba4ccaf816
Check that all faces are triangles.
2011-09-21 22:34:23 +09:00
57aa19bd44
Rename qfmdl to io_mesh_qfmdl.
...
This fits in better with the blender addon naming scheme.
2011-09-21 20:18:23 +09:00
c3b358f470
Clean up the intra-package import lines.
2011-09-21 19:17:16 +09:00
84f65a0171
Get the "front end" working nicely.
...
Proper enable/disable of export, file filtering and no exceptions :)
2011-09-21 19:17:16 +09:00
2ca39e7f75
Start working on the exporter.
2011-09-21 17:37:32 +09:00
4b9a421928
Split out the MDL class.
...
I will need it for the exporter.
2011-09-21 12:34:09 +09:00
af4a91accf
Do a tiny bit of cleanup.
2011-09-20 19:32:49 +09:00
b00e865d4c
Make the importer work in both 2.58 and svn blender.
2011-09-20 18:58:45 +09:00
67ba9129ed
Report bad mdl files.
2011-09-20 13:34:12 +09:00
9a4e5aef53
Read strings as strings rather than bytes.
2011-09-20 13:33:41 +09:00
a32e45d2d5
Refactor the import code.
...
This should make things a little more maintainable.
2011-09-20 12:44:37 +09:00
d90fd4cee9
Fix a mistake found by a debug build of blender.
2011-09-18 18:49:16 +09:00
c65522b5cf
Add key frames for all shape keys.
2011-09-18 15:37:17 +09:00
94ac2fa675
Remove a debug print
2011-09-18 10:37:28 +09:00
b57e098e93
Rewrite the frame group to action conversion.
...
Now it works :) Mostly :/ Need to figure out how to "finalize" the action.
Also, blender occasionally loses my skin texture :(
2011-09-18 09:58:59 +09:00
dbb1df70b5
Fix frame merging for mdlv3 files.
...
v3 files have no name fields in the frames, so we need to store the
generated name.
2011-09-18 09:18:49 +09:00
ad8afec84c
Merge multiple frames into a single frame group.
...
But only if they seem to be related (ie, the frame name is the same up to
the number). This will later become optional, but it allows me to test
some of the frame group code.
2011-09-17 23:41:35 +09:00
dc76ad6556
Create actions for frames and frame groups.
...
Simple frames get a one key action, groups get an action with a key per
subframe.
2011-09-17 23:13:21 +09:00
644f4db9d1
Add support for v3 (qtest) mdl files.
...
Finally, I can see the dragon in all its... glory?
2011-09-17 09:05:07 +09:00
f7de55ed5e
Create a shape key for every frame and subframe.
...
Shammy has no frame groups :(. Need to find a model with groups.
2011-09-16 20:59:39 +09:00
b0af18478b
Be a little more direct in object linking and materal adding.
2011-09-16 19:14:31 +09:00
de24fa99a8
Break out the skin/material setup code.
2011-09-16 17:57:07 +09:00
41213f2c30
Make the skin show in blender's 3d view.
...
Much thanks to ideasman_42 for showing me which code I needed to grok to
get it working.
2011-09-15 22:45:23 +09:00
320f613263
Give the uvlayer texture a name.
2011-09-15 20:39:26 +09:00
257fefca38
Link the first skin to the imported object.
...
The texture doesn't display properly in 3d space in texture mode yet.
2011-09-15 19:52:18 +09:00
7489d5646b
Convert all skins.
...
Skin groups are now partially supported.
2011-09-15 19:51:52 +09:00
f8e1e3d4ec
Fix incorrect bracket/parens
2011-09-15 19:18:31 +09:00
11f37298be
Reveres the face windings.
...
Blender's vertex order and quake's vertex order seem to be opposed.
2011-09-15 17:23:40 +09:00
0569e0ebd3
Build the uv layout.
2011-09-15 13:21:08 +09:00
99ff91e341
Load the skins into blender images.
...
Skin groups are not yet supported (skipped).
2011-09-15 11:29:54 +09:00
9d025e0058
Begin working on an mdl import/export plugin for blender.
...
This is only preliminary at this stage:
o No export yet.
o Only the first frame is converte4d.
o Skins are not yet converted
2011-09-14 19:33:51 +09:00
3de5575def
Move the menu files into the QF directory for win32.
2011-09-11 17:13:20 +09:00
a71acc9ae5
Move the essential init code into Sys_Init().
2011-09-11 14:56:47 +09:00
b9401fe7c6
Fix incomplete removal of old files.
2011-09-10 18:10:51 +09:00
505660dffe
Nuke another buffer.
...
Though snprintf was used, not having a buffer just makes things cleaner.
2011-09-07 09:41:06 +09:00
f75b0a611b
Some compile fixes for OpenBSD
2011-08-25 22:35:20 +09:00
70d42cc838
Allow light entities to specify a named light property.
2011-08-21 14:40:18 +09:00
73a280f86a
Handle all light types in the switch.
...
Even though nothing is down for those types.
2011-08-21 14:40:18 +09:00
2d8b011bc8
Support negative lights.
2011-08-21 14:40:18 +09:00
efce040d48
Document the fields qflight uses to control lighting.
2011-08-21 14:40:18 +09:00
e42c5a4272
More tests and fix vector/quaternion global dumps.
2011-08-11 14:58:13 +09:00
c6e0e094d8
Fix an unterminated array.
...
That was sneaky. It took building qfcc on an arm to trigger that bug.
2011-07-30 15:01:16 +09:00
d910c14935
Clean up some doxygen warnings.
2011-07-10 19:12:07 +09:00
617e70c8e3
Clean up a bunch of bison unused warnings.
2011-06-21 19:52:47 +09:00
0f7390dd60
Clean up all the "set but not used" warnings.
...
gcc on my system is failing to treat this specific warning as an error :/
2011-06-19 10:48:02 +09:00
dedda7596d
Just for fun :)
2011-06-15 17:33:03 +09:00
d638fdce83
Add a PlaneFlip macro.
2011-05-07 19:29:03 +09:00
b9d21cbe9a
Catch resizes in the camera view.
...
Avoids a segfault when resizing the window.
2011-04-16 18:58:05 +09:00
3337dc609f
Fix a buffer error.
2011-04-16 13:05:28 +09:00
fb65cd2b44
Cache needed fonts.
...
Obtaining a font has become rather expensive in recent gnustep, so cache
fonts, obtaining new ones only when needed rather than every redraw. Makes
things snappy again :)
2011-04-16 12:17:23 +09:00
36ec375893
Support resizing the window.
...
The resized layout isn't perfect, but at least the usable real estate for
the xy window grows nicely.
2011-04-10 14:34:34 +09:00
9e15e2cd76
Remove a debug print.
2011-04-10 09:14:28 +09:00
c7612dcd99
Make statement dumps a little more informative.
2011-04-10 09:08:46 +09:00
fd6e341e06
Clean up cast_expr() a little bit.
2011-04-10 00:29:27 +09:00
6cb3d18fc4
Use a hash table for finding entities.
...
This gives a major speed boost :)
2011-04-09 18:32:29 +09:00
32f3f5c06b
Use a hash table for epair lookup.
...
This gives a very minor speedup to drawing large maps.
2011-04-09 14:47:36 +09:00
57ed603658
Extract values from constant defs.
2011-04-09 12:42:41 +09:00
cc714864a8
Support converting to/from unsigned values.
2011-04-09 11:32:33 +09:00
55cc0f9206
Bring back the unsigned type (PROGS version bump)
...
This is only low-level support (the unsigned keyword still does not work),
but sufficient to make switch statements using jump tables work.
2011-04-09 10:07:47 +09:00
b522853765
Ensure the target of def_op relocs gets updated.
...
These occur only when switch statements use jump tables, thus why the
problem went unnoticed :/
2011-04-08 17:09:40 +09:00
237f11c472
Fix cast expressions.
...
Casting between ints and floats needs special treatment to get the
conversion operator, but other casts need to be aliases.
2011-04-08 13:55:26 +09:00
c4a398850a
Fix defs as constants for vectors and quaternions.
2011-04-04 21:31:59 +09:00
38b25e0c38
Do not double-allocate space for immediates.
...
Caused by changed semantics in def creation.
2011-04-03 13:11:50 +09:00
92ba110a87
Ensure a field def is emitted for @this.
2011-04-03 13:03:48 +09:00
7f67e6eb17
Refactor the def handling code a little.
2011-04-03 13:03:22 +09:00
6d0b13dbf0
Resolve types whenever possible.
2011-04-03 13:02:04 +09:00
2c9c1bd968
Ensure defs for @self and @this are generated.
2011-04-03 13:00:48 +09:00
2de7733b6a
Fix initialized variable type handling.
...
Same problem as initialized constants :P
2011-03-30 21:21:38 +09:00
8e18c76bde
Make initialized variables defs rather than immediate constants.
2011-03-30 19:58:09 +09:00
7dbd2ec172
Allow field aliasing.
...
Initializing a field variable to another field will set the new field to
point to the same location. No type checking is done.
eg:
.SEL thinkMethod = think;
2011-03-30 09:33:47 +09:00
550fff5467
Allow assignments between any field types.
2011-03-30 08:14:17 +09:00
75c3653be4
Implement some missed relocs.
2011-03-30 08:13:13 +09:00
2bddcefafe
Allow up to 64 faces on a brush.
...
This is temporary until unlimited faces can be supported, but it's
sufficient to load mappi.map.
2011-03-29 12:46:49 +09:00
1911cc1472
Mingw build fixes.
2011-03-27 08:26:42 +09:00
896791b209
Correct the spelling of "int" and clean up the mess.
2011-03-25 16:53:04 +09:00
1617f0765e
Support the default type without segfaulting.
2011-03-25 09:59:48 +09:00
a7cfe3b215
Preserve the current class across protocol defs.
...
It seems that protocol defs are allowed in class implementations, so don't
let the protocol def kill the current class for the class implementation.
2011-03-24 11:55:17 +09:00
71af121665
Detect missing @end tags.
...
Give a warning when @end is forgotten in class implementations.
2011-03-24 11:44:22 +09:00
8d3508cf20
Allocate space for temp defs using size rather than type.
...
Statement operands throw away the high level type information, so store
type size in the operand and use this size for allocating space for temps
rather than using the low-level type.
2011-03-23 21:32:14 +09:00
9b62c8c126
Rename ty_type_e to ty_meta_e and type_t.ty to type_t.meta
2011-03-22 16:06:47 +09:00
d4be914019
Fix initialized vector variables.
...
The whole initialized variable system is wonky, but it will do for now.
2011-03-22 15:10:06 +09:00
a9eb793a5e
Yay, even more tests :P
2011-03-22 15:00:46 +09:00
6a49861b49
Fix the bogus source file for "redefined" functions.
2011-03-22 13:45:44 +09:00
7dbd5f656c
Fix traditional vector component access.
2011-03-22 13:05:42 +09:00
f1d9570dc8
Fix constant value type handling.
...
Rename immediate.[ch] to value.[ch] and clean up the mess.
Add convert_value() to convert the type of a value (only scalar types).
2011-03-22 12:24:39 +09:00
1219df0872
Fix field immediates.
...
Field immediates need to be treated the same way as pointer immediates when
merging values.
2011-03-21 18:11:46 +09:00
46093c0937
Use the correct meta type for spacial types.
...
Although vector and quaternion types have symbol tables, they are not
really structs, so set the meta type to "none", allowing the types to be
encoded correctly.
2011-03-21 17:26:49 +09:00
cefe7e2e94
Use the correct source of defs for field defs.
2011-03-21 17:07:40 +09:00
0c0f4360da
Make field defs "nosave".
...
The engine treats fielddefs with DEF_SAVEGLOBAL set as bogus.
2011-03-21 17:06:45 +09:00
f5ce9e2004
Fix a merge induced error in overloaded functions.
2011-03-20 19:04:18 +09:00
1ada2a96cf
Merge branch 'master' into qfcc-codegen
...
Conflicts:
tools/qfcc/source/expr.c
tools/qfcc/source/function.c
tools/qwaq/test.r
2011-03-20 15:58:31 +09:00
a919e5f619
Make class_check_ivars() use class_add_ivars() to add the ivars.
...
This avoids implementation ivar blocks trashing the ivar offsets in
derived classes.
2011-03-20 13:35:59 +09:00
8c8a6a4d63
The function return type is the address of the type descriptor...
2011-03-17 20:31:20 +09:00
01144d23cf
Add a new gcc warning option and fix the two bugs it found.
2011-03-17 19:58:56 +09:00
5aa0b34570
Add the cast statement to the statement block.
...
*sob*
2011-03-10 20:43:53 +09:00
f663f587fe
Fix the missing local defs for builtin functions.
2011-03-10 20:16:35 +09:00
899af3119b
Use the correct type when generating a move expression.
2011-03-10 19:30:21 +09:00
2129eaaf20
Dereference moves need movepi rather than movei.
2011-03-10 19:29:23 +09:00
Bill Currie
Jeff Teunissen