Goober5000
33151e956d
fix a bug in the option comparison, and also add sanity checking for infinite rotation rates
2016-04-03 21:07:55 -04:00
Goober5000
08e565a855
use $rotate, $rotate_rate, and $rotate_time, and their $dumb_ equivalents, with proper backwards compatibility
2016-04-03 18:15:20 -04:00
asarium
05fbb8d4de
Fix issue #572
2016-04-01 12:03:19 +02:00
niffiwan
07284cf221
Cleanup weapon_info when models are unloaded
...
Avoids the assertions at model/modelread.cpp:3062
ASSERTION FAILED: "Polygon_models[num]->id == model_num" (etc)
2016-03-27 17:04:14 +10:00
Goober5000
fbc0c79973
fix the $dumb_rotate turn rate calculation to align with regular $rotate
2016-03-19 17:02:55 -04:00
Goober5000
e302f0e456
convert the rest of the model instance functions to have model_instance_num parameters instead of object parameters
2016-02-10 23:23:44 -05:00
Goober5000
471c898df5
modify function headers as suggested in PR #530
2016-02-06 15:46:06 -05:00
Goober5000
df41bbe172
refactor of dumb_rotation to intrinsic_rotation
...
This is a renaming of the Dumb_rotation infrastructure, which is now called Intrinsic_rotation. Intrinsic rotations are automatically applied to submodels without the need for an associated subsystem. Dumb rotations are now a type of intrinsic rotation, and look_at rotations will be added in a future PR. The same code will handle both; the only difference is in how the intrinsic rotation is calculated. (In the case of dumb-rotation, it is calculated the same way as normal rotation; in the case of look-at, it will be calculated using submodel_look_at.)
2016-02-05 12:40:55 -05:00
Goober5000
5bcc89be3a
one small bugfix, one small comment tweak
...
This fixes a bug where, when the skybox is changed after loading a new mission, it tries to delete its model instance which was already deleted in model_instance_free_all. Setting the instance reference to -1 when the instance is freed fixes this. (This is something that would typically be handled by the object_delete function, as it is for ship_delete, asteroid_delete, and weapon_delete, but there is no such equivalent for skyboxes.)
Since this is such a small PR, I decided to also include a stash where I restored a comment that was inadvertently deleted by Swifty's hud_lock variable scope fix PR.
2016-01-29 12:37:14 -05:00
Goober5000
59d6a44db3
colons are redundant
2016-01-25 19:31:52 -05:00
Goober5000
975e108841
further accommodation of the dumb-rotation movement type, including, finally, proper collision detection!
2016-01-25 01:29:51 -05:00
Goober5000
6d60bb1511
add some additional clarifying comments
2016-01-25 00:49:21 -05:00
Goober5000
28faa9e588
warn for dumb-rotation as well as regular rotation
2016-01-25 00:26:26 -05:00
Goober5000
78ff02501b
improve debug warning handling
2016-01-24 21:41:31 -05:00
Goober5000
b9033ab2a2
fix Travis error
2016-01-24 19:00:04 -05:00
Goober5000
102efb192c
some additional error handling
2016-01-24 17:55:13 -05:00
Goober5000
4b05468f3c
update comment with a small clarification, add an assertion that the function contract is being followed, and fix an incipient bug by adding a necessary is_ship flag
2016-01-20 14:44:45 -05:00
Goober5000
26a500bf7c
address warnings flagged by Travis
2016-01-19 22:18:09 -05:00
Goober5000
81ad6dc1b5
remove a field that is now redundant
2016-01-05 01:04:46 -05:00
Goober5000
025c58c679
fix const-correctness due to Swifty's change
2016-01-05 00:56:51 -05:00
Goober5000
bb93319871
small update due to changed API
2016-01-04 23:34:30 -05:00
Goober5000
8f224a76a4
incorporate turning rate
2016-01-04 23:34:30 -05:00
Goober5000
a640015afc
tweak the creation of dumb_rotate instances; move the check for can_move below look_at and dumb_rotate
2016-01-04 23:34:29 -05:00
Goober5000
82807f2760
delete dumb rotations when we delete the associated instance
2016-01-04 23:34:29 -05:00
Goober5000
97924c0628
Add data structures and the hook to create the dumb rotations when model instances are created. This might be sufficient to get dumb rotations working for ships.
2016-01-04 23:34:28 -05:00
Goober5000
680ac9175f
move the two dumb_rotation iterations into one function (which calls a subfunction) in modelread.cpp, and add some descriptive commenting
2016-01-04 23:34:28 -05:00
Goober5000
e3c4f90287
first chunk of work to reimplementing dumb_rotate in a way that syncs with the rest of the model code
2016-01-04 23:34:27 -05:00
Goober5000
ed2bbc35eb
Merge pull request #501 from SamuelCho/kill_ship_model_start
...
Killed the last vestiges of ship_model_start/stop.
2016-01-04 22:45:03 -05:00
Echelon9
e4c98e8527
Remove final DirectX Shader Model concepts. OpenGL GLSL version supported by the driver can be directly queried, rather than a layer of abstraction through SM2, SM3 and SM4. Allows Use_GLSL to be removed following refactoring.
2016-01-03 16:33:04 -05:00
Echelon9
5d593f0df0
Plumb through is_minimum_GLSL_version()
2016-01-03 16:33:04 -05:00
SamuelCho
4a4486c9be
Merge branch 'master' into kill_ship_model_start
2016-01-03 13:02:47 -08:00
SamuelCho
0f0f6377d0
Killed the last vestiges of ship_model_start/stop.
2015-12-13 23:51:24 -08:00
Samuel Cho
2deffc1156
Removed comment from model_set_instance that no longer describes SSF_NO_DISAPPEAR functionality.
2015-12-09 10:32:36 -08:00
SamuelCho
0062d2567a
Fixes missing destroyed submodels from the polymodel_instance rendering commit.
2015-12-08 23:53:53 -08:00
Fabian Woltermann
aaa80dfa6f
Merge pull request #486 from SamuelCho/model_instance_rendering
...
Allow model rendering code to use polymodel_instance.
2015-12-03 06:34:09 +01:00
SamuelCho
59fa7bd544
Remove superfluous line.
2015-12-02 19:08:59 -08:00
SamuelCho
64ad950a80
Allow model rendering code to use polymodel_instance. Removes the reliance on ship_model_start/stop for rendering models. Also fix a bunch of oversights involving blown off models in the polymodel_instance code.
2015-12-01 23:53:24 -08:00
The E
487f769064
Renaming vm_copy_transpose_matrix to vm_copy_transpose
2015-12-01 20:38:30 +01:00
The E
e0defd287a
Renaming vm_vec_crossprod to vm_vec_cross
2015-12-01 20:36:34 +01:00
The E
a413255728
Renaming vm_vec_dotprod to vm_vec_dot
2015-12-01 20:35:47 +01:00
asarium
154a50028b
Make this Assert a little more informative
2015-11-18 18:43:19 +01:00
niffiwan
2c8d921d64
Change Assert to Error
...
This seems to be a data error rather than a coding error. Also provide
the user with more info to assist with tracking down the source of the
problem.
2015-11-08 13:04:13 +10:00
asarium
1d2153794c
Fix an overflow warning
...
Signed overflow is not well defined in the standard but unsinged it so now that is used to determine if the model index counter has overflown.
2015-10-14 17:45:46 +02:00
Goober5000
b2215ddf7d
the model filename is useful to have in the debug message
2015-08-24 12:59:15 -04:00
MageKing17
64c9b272e7
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/pilotfile/pilotfile.cpp
2015-08-19 11:53:25 -07:00
asarium
1cd7744d34
Fix "operator '?:' has lower precedence" warning
...
I think the ?: expression was meant to take precedence
2015-08-19 11:26:30 +02:00
asarium
9cbf944dee
Fix format warning in modelread.cpp
2015-08-19 11:26:28 +02:00
Goober5000
bd3cd7eb18
Merge pull request #195 from Echelon9/fix/sort-uniq-includes
...
Review and refactor #include's
2015-08-19 00:05:02 -04:00
MageKing17
6985b198ec
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-08-12 13:25:34 -07:00
Echelon9
8160cd40dc
Change s/Error code/Error message/ in parse_glowpoint_table()
2015-08-06 17:54:41 +10:00
Goober5000