Thoronador
1b8c975d5b
minor performance improvements in apps/openmw
...
Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.
For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
2014-04-27 19:10:23 +02:00
scrawl
2a4e99c069
Set StaticGeometry origin
...
Fixes an exception for coordinates far away from (0,0,0).
2014-03-05 21:46:37 +01:00
Marc Zinnschlag
367919200f
moved CellRefList into a separate file
2014-02-23 20:11:05 +01:00
scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
scrawl
5931fdcbde
Implement NiBillboardNode. Flags not handled yet.
2013-12-26 20:53:52 +01:00
Marc Zinnschlag
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
2013-12-07 12:27:06 +01:00
Marc Zinnschlag
e818d43bc3
removed an outdated typedef and some dead code
2013-12-05 13:21:26 +01:00
scrawl
97fadb24ca
Update the Ptr in mObjects in Objects::updateObjectCell
2013-11-27 18:49:04 +01:00
scrawl
0dc2e829dd
Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.
2013-11-17 23:31:08 +01:00
Chris Robinson
0463dc0653
Use a smaller static geometry size for interior cells
2013-08-25 16:08:43 -07:00
Chris Robinson
076e7d8e16
Make insertBegin internal
2013-08-07 03:56:07 -07:00
Chris Robinson
0458fd5531
Remove unused/unneeded parameters
2013-08-07 03:56:06 -07:00
Chris Robinson
80d271aeb1
Remove unused stuff
2013-08-07 01:31:01 -07:00
Chris Robinson
3555476dfd
Use Animation-derived objects for generic objects
2013-08-06 19:49:07 -07:00
Chris Robinson
57fb065a86
Add Ogre::Light objects to the object list
...
Note that NIFs actually have NiLight-based light records which could be
used to create Ogre::Light objects. However, no Morrowind NIF uses them,
as far as I can tell.
2013-08-06 19:49:01 -07:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
Chris Robinson
2db72ae607
Rename EntityList to ObjectList
2013-04-07 01:52:35 -07:00
Chris Robinson
77ba0fbe73
Prepare for creating particles
...
This adds a vector of ParticleSystems to the EntityList, and modifies
corresponding code to handle it. It also loads the ParticleFX plugin so
particles can be created (although they aren't yet).
2013-04-04 05:10:52 -07:00
scrawl
5e7e9fd26a
Properly calculate light activation range
2013-03-29 20:21:37 +01:00
Marc Zinnschlag
e7684c4677
some random cleanup
2013-03-29 09:04:02 +01:00
Chris Robinson
c5f0556451
Handle light linear/quadratic settings
2013-03-28 20:57:33 -07:00
Glorf
521bebd2f4
Fallback system rewritten, added light fallbacks
2013-03-15 10:17:30 +01:00
scrawl
ca707aa65f
Transparency should be evaluated per subentity, not per NIF
2013-03-04 16:57:00 +01:00
scrawl
05bd94effb
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-03-03 15:14:20 +01:00
scrawl
0f6fd80294
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwrender/npcanimation.cpp
files/mygui/openmw_settings_window.layout
2013-03-03 11:02:38 +01:00
Nathan Jeffords
109dff2d29
renamed high level NIF files...
2013-03-02 13:23:09 -08:00
Chris Robinson
e6b547b9ba
Merge remote-tracking branch 'zini/master' into transparency-fixes
2013-03-01 13:32:30 -08:00
Chris Robinson
238a8feb18
Fix transparency checks
2013-03-01 13:27:25 -08:00
scrawl
1d988676fe
Local map: the obtained bounding box wasn't exactly accurate, getWorldBoundingBox seems to solve this.
2013-02-28 22:56:29 +01:00
Chris Robinson
1168f15361
Don't disable depth writes when blending is enabled
2013-02-28 12:17:58 -08:00
scrawl
d4264353a3
Merge branch 'z-up' into graphics
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
2013-02-26 14:54:53 +01:00
scrawl
cc9b72b9b1
Removing some leftovers of mwRoot node
2013-02-26 14:01:10 +01:00
scrawl
cacdb33b42
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/sky.cpp
2013-02-25 15:12:03 +01:00
Chris Robinson
5267d17408
Revert "forgot to destroy child scene nodes"
...
This reverts commit f1a3309392
2013-02-24 14:14:08 -08:00
ChrisKCat
9e7b559b09
Merge pull request #6 from scrawl/lights
...
For light objects without an AttachLight bone, attach the light to the c...
2013-02-24 14:12:53 -08:00
scrawl
f1a3309392
forgot to destroy child scene nodes
2013-02-24 19:03:25 +01:00
scrawl
1ae2d3c6ab
For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin.
2013-02-24 19:00:06 +01:00
greye
6a8c532244
fix and unify object cell change update in mwrender
2013-02-24 15:04:56 +04:00
Chris Robinson
0148db8ccf
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
2013-02-23 05:59:35 -08:00
scrawl
4b51184ec4
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-23 14:37:28 +01:00
greye
ac7095537f
remove insertMesh() call on object cell change
2013-02-23 16:50:37 +04:00
scrawl
f17ea109ca
Fix light positions
2013-02-23 04:06:05 +01:00
Chris Robinson
7f2d71554e
Use the correct offset when building static geometry from an entity
2013-01-10 04:16:18 -08:00
scrawl
d3c0851aa7
Changed light attenuation back to linear in all cases, this seems to be what MW does.
2013-01-09 22:08:42 +01:00
Chris Robinson
c4c8295e0b
Rename NIFLoader to Loader, and update some comments
2013-01-09 09:10:59 -08:00
Chris Robinson
9675a6d04a
Merge remote-tracking branch 'zini/master' into animation2
2013-01-08 02:25:37 -08:00
Marc Zinnschlag
2557ef4d7d
post merge fixes and some misc clean up
2013-01-07 12:17:46 +01:00
Nathan Jeffords
0f3712f284
change flickering light's brightness pattern
2013-01-06 14:29:22 -08:00
Chris Robinson
58d35dbfcf
Have createEntities' caller retrieve the text keys as needed
2013-01-05 04:01:11 -08:00
greye
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
2012-11-05 16:07:59 +04:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
scrawl
950bf66334
throw an exception if default value for a setting is not found
2012-09-02 11:39:54 +02:00
greye
d6150b7482
high-level implementation, unstable
2012-07-30 23:28:14 +04:00
Chris Robinson
36be1536d9
Return text keys from NIFs when creating entities
2012-07-23 17:20:47 -07:00
scrawl
f8d6a36196
Merge branch 'master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/sky.cpp
apps/openmw/mwrender/sky.hpp
components/nifogre/ogre_nif_loader.cpp
components/nifogre/ogre_nif_loader.hpp
2012-07-23 15:35:31 +02:00
Chris Robinson
3dedac5cb1
Create mesh entities for objects when loading the NIF
2012-07-17 13:40:03 -07:00
Chris Robinson
a539e98274
Handle all meshes when inserting objects into the scene
2012-07-16 10:48:48 -07:00
Chris Robinson
939d0d2fc5
Return a list of meshes and the skeleton from NIFLoader::load
2012-07-13 20:01:15 -07:00
scrawl
865bfc6f47
sync mrt_output setting
2012-07-11 02:31:03 +02:00
Marc Zinnschlag
c85aaafac2
more include cleanup (most removing Ogre.h)
2012-07-03 15:32:38 +02:00
Marc Zinnschlag
87667ab57e
Issue #107 : Ptr related include cleanup
2012-07-03 13:55:53 +02:00
Marc Zinnschlag
7fcd41c69d
Issue #107 : Detemplateised CellStore; some include cleanup
2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
2012-06-29 16:48:50 +02:00
gugus
9dd65dce30
Finished merging.
2012-05-11 11:52:07 +02:00
scrawl
4655ec94f0
Merge branch 'master' into physicsaedra2 & fix warnings
...
Conflicts:
apps/openmw/mwworld/scene.cpp
2012-04-30 18:46:51 +02:00
Marc Zinnschlag
d1d21c8a0e
compile fix
2012-04-28 21:21:40 +02:00
scrawl
4ce83badc9
flickering lights
2012-04-28 20:42:53 +02:00
scrawl
c6da3872b4
light improvements
2012-04-19 20:59:57 +02:00
scrawl
f2fae770d4
Merge branch 'master' into physicsaedra2
...
Conflicts:
apps/openmw/mwworld/player.cpp
2012-04-13 13:55:13 +02:00
scrawl
2a4fcf42a3
basic shadows
2012-04-11 18:53:13 +02:00
scrawl
9e1a9e5758
Merge branch 'master' into physicsaedra2
...
Conflicts:
apps/openmw/mwinput/inputmanager.cpp
libs/openengine/bullet/physic.cpp
2012-04-08 17:08:36 +02:00
scrawl
113bbfa253
removed the now unneccesary SG for transparent objects
2012-04-08 14:37:36 +02:00
scrawl
b8a470efcd
put transparent objects in a seperate render queue, in order to not mess up the mrt textures
2012-04-05 19:07:21 +02:00
scrawl
6442d49e16
render queue groups, sky fix
2012-04-04 18:53:40 +02:00
scrawl
8aea311797
added visibility flags for everything
2012-04-03 15:13:47 +02:00
scrawl
16481b0594
Merge branch 'master' into minimap
2012-04-02 19:38:36 +02:00
scrawl
342464530d
rotated map working
2012-04-02 19:37:24 +02:00
scrawl
5f2a674d93
fixed a typo
2012-04-02 16:14:39 +02:00
scrawl
fd662f937a
add settings for viewing distance and fog
2012-04-02 15:51:48 +02:00
scrawl
e5cc9adbb0
added settings for rendering distance of small objects
2012-04-02 15:30:29 +02:00
scrawl
1445ae992d
adding a setting to disable static geometry
2012-04-02 14:24:16 +02:00
Marc Zinnschlag
647c0e4df3
Merge remote branch 'scrawl/renderingdistance'
2012-03-29 21:27:25 +02:00
scrawl
0332a8df96
Merge branch 'renderingdistance' into minimap
2012-03-29 18:09:24 +02:00
Marc Zinnschlag
10b4c1d904
silenced a warning
2012-03-29 18:04:52 +02:00
scrawl
e22ae7c840
bounds fix (again)
2012-03-29 17:30:13 +02:00
scrawl
19c801f538
disabled rendering distance for now
2012-03-29 16:56:30 +02:00
scrawl
f45c650975
bounds fix
2012-03-29 16:47:59 +02:00
scrawl
bb09c2189a
lower rendering distance for small objects (reduce batch count)
2012-03-27 00:45:25 +02:00
Jason Hooks
18a139cd66
adding up and down move buttons
2012-03-24 22:03:08 -04:00
scrawl
5b38b17baf
local map rendering (nothing to see yet, as it is not displayed in GUI)
2012-03-10 15:28:18 +01:00
scrawl
42a7375a0b
adjusted the batch region size, this was the cause for lights going on/off bug
2012-03-04 23:26:35 +01:00
Marc Zinnschlag
784c6fe0ff
some cleanup
2012-02-06 10:41:13 +01:00
Marc Zinnschlag
e1600d9a2a
fixed movable object cleanup for ordinary objects
2012-02-06 10:29:18 +01:00
Jason Hooks
0d3338f867
Some naming changes
2011-11-22 02:39:28 -05:00
Marc Zinnschlag
51d5c7cd59
Merge remote branch 'jhooks/mwrender' into mwrender
...
Conflicts:
apps/openmw/engine.cpp
- fixed code that did not compile
- removed tons of tabs
- more clean up
2011-11-21 12:52:28 +01:00
Jason Hooks
7385948056
Yet another crash fix
2011-11-19 20:22:56 -05:00
Jason Hooks
7319f7a8c6
Many bugs fixed related to changing cells
2011-11-19 01:01:19 -05:00
Jason Hooks
4dc59dfbdd
Scenenode flip
2011-11-17 17:10:27 -05:00
Jason Hooks
62d8d1add2
more recommended changes
2011-11-11 14:37:42 -05:00
Jason Hooks
a7652bcb0c
Yacoby's changes on Objects
2011-11-09 13:53:29 -05:00
