mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-24 12:53:52 +00:00
Code Issues Releases Wiki Activity
24968 commits 38 branches 54 tags 122 MiB
Commit graph

2829 commits

Author SHA1 Message Date
scrawl
325bf66653 Return const Land in ESMStore 2017-02-14 07:58:16 +01:00
scrawl
9fa8e88366 Revert "Don't create a CharacterController for objects with no animations" 
This reverts commit cce42b6e9d.
 2017-02-12 10:22:11 +01:00
scrawl
dd54887783 Fix node mask of CharacterPreview being reset 2017-02-10 03:31:37 +01:00
scrawl
67e4a7e37b Change some osg::clone's to direct copy constructor to avoid dynamic_cast overhead 2017-02-09 04:51:20 +01:00
scrawl
d141b98f0c Add base animations to preloadCommonAssets 2017-02-09 03:32:40 +01:00
scrawl
d1e86d22ca Check which local map textures actually need to be updated 
On a typical exterior cell transition, we'll save 3 of 9 map renders. When moving back and forth between 2 cells, we can even reuse 6 of 9.
 2017-02-08 22:20:57 +01:00
scrawl
249fe9077b Handle 'tcb' command as an alias for 'tcg' 2017-02-08 18:51:07 +01:00
scrawl
cce42b6e9d Don't create a CharacterController for objects with no animations 2017-02-06 03:43:08 +01:00
scrawl
ee4073541c Animation: cache getVelocity() 2017-02-05 02:26:28 +01:00
scrawl
884d306bf3 Throw exception when told to use 0 threads 2017-02-04 05:58:12 +01:00
scrawl
2db7292bcb Add new setting for the number of preloading worker threads 
If you have CPU cores to spare, consider setting 2 or 3. Up to about 3 threads, preloading performance seems to increase in a linear fashion, but with 4 or more threads I/O bottlenecks and synchronization overhead starts to show.
 2017-02-04 02:59:28 +01:00
scrawl
33e654f94d Add explicit handling of most commonly used nodes to NodeVisitors to avoid excessive virtual function calls 2017-02-04 02:16:26 +01:00
scrawl
767eba941f Speed up finding of attachment node by using the cached nodeMap 2017-02-03 23:15:37 +01:00
scrawl
a76d693627 Speed up ControllerVisitor by skipping sub graphs that have no ChildrenRequiringUpdateTraversal() 2017-02-03 23:10:14 +01:00
scrawl
c5f8ff6e0e Add names to several nodes for debugging purposes 2017-02-02 21:49:52 +01:00
scrawl
1808b8567e Add 'small feature culling pixel size' setting specifically for water RTTs, by default set higher than the one in [Camera] 2017-02-01 06:00:14 +01:00
scrawl
fcb4129aee Add 'small feature culling pixel size' setting 2017-02-01 06:00:14 +01:00
scrawl
960d4a96c3 Reduce the number of osg::Material state by setting the default state on the graph root 2017-02-01 06:00:14 +01:00
scrawl
34deb6e7b1 Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes 2017-02-01 06:00:14 +01:00
Martin-Kevin Neumann
5a8efa1649 added refactoring of shader handling from visvalda's fog shader 2017-01-15 14:17:22 +01:00
scrawl
80c008906b Fix texture coordinates 2017-01-02 04:50:33 +01:00
scrawl
48a23d61b2 Mask out water in global map overlay 2017-01-02 04:01:04 +01:00
scrawl
dc1f788cff Use osg::PI over M_PI 2016-12-21 16:49:37 +01:00
scrawl
cca75499ee Clear the Skeleton's bone cache when a node is added/removed (Fixes #3663) 2016-12-16 20:09:20 +01:00
Leon Krieg
739cd5ba45 Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
Leon Krieg
c7b4b2cdd7 Fixed multiple spelling mistakes 2016-12-14 16:39:33 +01:00
scrawl
16a913c549 Add emission of water ripple particles for water-walking actors (Fixes #3608) 2016-11-20 18:47:12 +01:00
scrawl
f51e06bc47 Recreate shaders if necessary when the NpcAnimation is rebuilt 
This fixes certain equipment losing the 'invisibility' effect after a view-mode switch with shaders enabled. Because the initial build of shaders done by the resource manager is not aware of the override state in the NpcAnimation's object root, we have to build new shaders here.
 2016-11-19 23:53:22 +01:00
scrawl
e823cbf018 Fix incorrect priority of animation sources (Bug #3626) 2016-11-19 23:53:22 +01:00
scrawl
2368382ea5 Fix upside down rain particle texture 2016-11-17 17:52:20 +01:00
scrawl
cac8de0b29 Merge pull request #1116 from Allofich/paused 
Don't update ripple simulation when paused
 2016-10-30 19:26:56 +01:00
Allofich
19db070fca Don't update ripple simulation when paused 2016-10-31 01:19:38 +09:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
Allofich
1c54f54ab8 Fix shadowing warnings 2016-10-15 00:12:46 +09:00
MiroslavR
611d02ad43 Remove unused code 2016-10-11 22:16:17 +02:00
MiroslavR
1906d96064 Non-player actors emitting light from a non-portable light item should be illuminated (Fixes #3588) 2016-10-11 22:15:51 +02:00
scrawl
1893617ec9 Improvements to ignored light list setting 
The pointer to the LightListCallback is now stored in the Animation, which eliminates the need for dynamic_cast. Also, when the object root is recreated, the previously used LightListCallback will be reused, so we no longer need the objectRootReset() notifier.

Finally, there was a bug when saving and reloading the game, the getIgnoredLightSources() were not being set, as the ActorAnimation constructor completes before the NpcAnimation sets the ObjectRoot. This was solved by creating the LightListCallback in advance in the Animation constructor.
 2016-10-08 23:59:28 +02:00
MiroslavR
11565b5966 Make actors with non-portable lights in inventory glow (Closes #2042, #3338) 2016-10-08 23:17:12 +02:00
scrawl
6615330430 Fix use of UnrefQueue in removeObject 2016-10-08 16:41:17 +02:00
sandstranger
5230bf6528 disable using shaders for gles1 and Android 2016-10-03 20:31:08 +04:00
scrawl
85c7d014d3 Use a shader to render the simple water, ensuring that fog is applied per pixel (Fixes #2716) 2016-09-28 21:10:44 +02:00
Allofich
a8e9f2df67 Cleanup 2016-09-19 05:20:04 +09:00
Allofich
5aad1d81f4 Remove no longer used parameter 2016-09-15 23:41:20 +09:00
Allofich
dc8ff5e49b Play all sfx and use particle textures for permanent enchantments 2016-09-15 00:27:08 +09:00
Allofich
527bbd5243 Change size_t to int for consistency 2016-09-15 00:09:40 +09:00
Allofich
01774c656c Fix for blood effect texture overrides 2016-09-14 23:28:57 +09:00
Allofich
a033ba3bd2 Override spell textures by NiTexturingProperty 2016-09-14 23:03:04 +09:00
Allofich
7db31ab58a Correct telekinesis glow length 2016-08-24 01:21:15 +09:00
scrawl
0fd810707e Remove unused stopLooping() 2016-08-22 23:33:26 +02:00
scrawl
0c9882956a Add AnimState::shouldLoop() 2016-08-22 23:25:00 +02:00
scrawl
6450c9be27 Simplify condition 2016-08-22 23:22:58 +02:00
Allofich
bf9dc45b2b Emulate vanilla animation loops more closely 2016-08-23 01:42:36 +09:00
scrawl
dda5bfbc9f CharacterPreview no longer depends on osgViewer 2016-08-16 22:47:45 +02:00
scrawl
8bfcf259a3 LocalMap no longer depends on osgViewer 2016-08-16 22:37:44 +02:00
scrawl
b2ae45f0eb Remove unneeded setGraphicsContext() calls 2016-08-16 19:33:09 +02:00
scrawl
641005b317 Remove Camera's children before removing the Camera 
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
 2016-08-15 18:12:46 +02:00
scrawl
71f786ff84 Delete the WorkQueue first 
Fixes a potential crash on exit.
 2016-08-14 18:10:29 +02:00
scrawl
c65492193c Use osg::clone 2016-08-14 16:41:44 +02:00
Allofich
83b715734f Move part of addGlow() to addSpellCastGlow() 2016-08-10 02:52:43 +09:00
Allofich
1c76c93ed8 Use raw pointer to node in glowupdater 2016-08-10 01:35:22 +09:00
Allofich
67f31d948e Add removeTexture method 2016-08-10 01:11:14 +09:00
Allofich
4b9aff7a03 Glowupdater fix when using shaders 2016-08-10 00:43:14 +09:00
Allofich
9b2cb2fb8c Cleanups 2016-08-10 00:25:33 +09:00
Allofich
775162ccdf Rewrite spell glow implementation 2016-08-09 22:56:53 +09:00
Allofich
cad41599cf Fix travis build error and warnings 2016-08-09 22:56:53 +09:00
Allofich
1910128e9c Don't remove uniform when spell glow ends 2016-08-09 22:56:53 +09:00
Allofich
35c14bb9bb Minor rewrite, make "open" spells play glow effect 2016-08-09 22:56:53 +09:00
Allofich
e132b52a69 Handle spell glows within updatecallback 2016-08-09 22:56:53 +09:00
Allofich
57138b416e Fix spell glows to only run one at a time 2016-08-09 22:56:53 +09:00
Allofich
3841a8fb40 Make non-actors glow when they cast spells 2016-08-09 22:56:53 +09:00
scrawl
0bbd715f65 Fix the cloned StateSet not being assigned 2016-08-09 01:13:19 +02:00
Marc Zinnschlag
aa1ed9b172 Merge remote-tracking branch 'aesylwinn/RenderWater' 2016-08-07 17:03:58 +02:00
Aesylwinn
5753f52b47 Move water mesh + simple state generation to components library. 2016-08-05 13:25:05 -04:00
MiroslavR
b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 2016-08-03 03:52:35 +02:00
Internecine
90735d226d Replaced Store::find usage with Store::search to remove exception handlers. 2016-08-02 11:43:41 +12:00
Internecine
14165352f6 Added exception handlers when trying to retreive enchantment and magic effect data. 2016-08-01 13:16:42 +12:00
MiroslavR
19a8800d4d Fix camera distance not getting reset to max value (Fixes #3473) 2016-07-17 19:52:12 +02:00
scrawl
6f376bd499 Merge pull request #983 from Allofich/telekinesis 
Don't allow telekinesis on actors or teleport doors
 2016-07-08 23:47:43 +02:00
Allofich
538209b0a2 Change variable to mRatio and initialize it 2016-07-07 21:54:29 +09:00
Allofich
64d53a2314 Avoid double raycasts when using getFacedObject 2016-07-04 16:06:04 +09:00
scrawl
8f62ea2e80 Fix for "RigGeometry rendering with no skeleton" errors 2016-07-02 20:19:55 +02:00
scrawl
252b27f0ef Remove getEyePos() 2016-07-01 15:04:59 +02:00
scrawl
a00e4de5c3 Fix another bug related to vanity mode toggle 2016-06-10 01:44:32 +02:00
scrawl
c47a679ac9 Fix queueing of vanity mode toggle (Bug #3421) 2016-06-10 01:39:37 +02:00
scrawl
ce91637cf9 Do not use/assign the camera distance in first person mode (Fixes #3421) 2016-06-10 01:05:43 +02:00
scrawl
8fb8c2bae5 Fix "part has no parents" warning message caused by nodes being destroyed in the incorrect order 2016-06-07 02:43:25 +02:00
scrawl
44dd67ee0f Fix a potential crash for lights without a model that have "off by default" flag set 2016-05-19 22:35:25 +02:00
scrawl
a9561f738a Move RemoveParticlesVisitor to animation.cpp 2016-05-19 22:35:17 +02:00
scrawl
0efbdb25ee Improve const-correctness in Animation 2016-05-19 22:30:14 +02:00
scrawl
59cfcb38e2 Scale the sunlight specular color by weather's GlareView value (Fixes #3375) 2016-05-10 17:39:57 +02:00
Aesylwinn
14ae232938 Remove now unnecessary factory class. 
It was originally used for storing normals, but that functionality
was removed.
 2016-05-03 16:13:23 -04:00
Aesylwinn
5cac882123 Replace game version of pathgrid rendering with component. 2016-05-02 22:10:17 -04:00
Bret Curtis
2c90b0b78d fix a few spelling mistakes 2016-04-07 11:55:49 +02:00
scrawl
157c11398d Add terrain parallax mapping 2016-03-22 21:46:15 +01:00
scrawl
30402f75e3 Use xbase_anim_female as the base skeleton for female NPCs (Fixes #3258) 2016-03-18 00:24:38 +01:00
scrawl
2b38d10449 Always add xbase_anim 2016-03-18 00:17:05 +01:00
scrawl
85bd4f52f0 Improve occlusion query geometry rendering 2016-03-11 00:09:46 +01:00
scrawl
93ec289b1d Improve setting of occlusion query state 2016-03-10 23:18:20 +01:00
scrawl
f898bf493f Don't use Geodes 2016-03-10 13:17:01 +01:00
scrawl
137dde7cf8 Include cleanup 2016-03-10 12:59:17 +01:00
scrawl
0fc65db6bb Remove parts before setting the new object root 2016-03-06 11:34:15 +01:00
scrawl
0df975a4d7 Properly detach nodes in CopyRigVisitor (Fixes #3234) 2016-03-06 11:33:07 +01:00
scrawl
67c8faec75 Infinite loop fix 2016-03-02 13:20:23 +01:00
scrawl
08f06c6c2d Fix a crash that could occur with actors that define 'bip01 spine1' but do not define 'bip01 spine2' (Fixes #3223). 2016-03-01 16:58:39 +01:00
scrawl
87871d7d54 Don't add RotateController to an uncontrolled node 2016-02-29 20:23:19 +01:00
scrawl
84e9d346ef Remove duplicate include 2016-02-28 16:47:33 +01:00
scrawl
90a99991d1 Use empty() instead of !size() 2016-02-22 19:06:12 +01:00
scrawl
8bd16e4d5a Don't compute the world matrix multiple times 2016-02-22 18:58:19 +01:00
scrawl
8f81df2bd3 Cleanup 2016-02-20 20:34:56 +01:00
scrawl
0db7163363 Add specular mapping for terrain 2016-02-20 19:55:08 +01:00
scrawl
f01e8a6950 Add specular mapping for objects 2016-02-20 19:55:08 +01:00
scrawl
5cf2441b10 ShaderVisitor: support automatic recognition of normal maps based on file pattern 
Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'
 2016-02-20 18:00:43 +01:00
scrawl
6a0ac824bd Fix terrain error in OpenCS 2016-02-19 15:00:58 +01:00
scrawl
17c4dfdb62 Use the lowest unused texture unit for the enchanted item glow texture 2016-02-18 23:10:58 +01:00
scrawl
5e12a1b4ef Add enchanted item glow to the shader 2016-02-18 23:05:44 +01:00
scrawl
268594dcf1 Recreate shader in NpcAnimation::setAlpha 2016-02-18 22:48:53 +01:00
scrawl
a73512afb7 Add shader settings to settings.cfg 2016-02-18 19:38:34 +01:00
scrawl
553408949a Fix character preview 2016-02-18 19:37:57 +01:00
scrawl
bd279c63f7 Fix fog on water 2016-02-18 19:37:57 +01:00
scrawl
9376811213 Vertex lighting shader 2016-02-18 19:37:57 +01:00
scrawl
044e0a829a Add fog 2016-02-18 19:37:57 +01:00
scrawl
41e1fd407d Disable shaders for the sky 2016-02-18 19:37:56 +01:00
scrawl
a9ad1b09e2 Introduce ShaderManager & ShaderVisitor 
Actual shaders still to be written.
 2016-02-18 19:37:56 +01:00
scrawl
e05d975020 Change the way that texture filtering settings are applied at runtime 2016-02-18 19:37:55 +01:00
scrawl
7f89bb273a Add 'reflect actors' setting for the water shader, default off 2016-02-18 19:36:17 +01:00
scrawl
5824619a95 Clean up includes 2016-02-12 19:28:10 +01:00
scrawl
8b596dfcbe Remove support for OSG 3.2 
Since commit e8662bea31, we're using OSG functionality that contains an unfixed crash bug in version 3.2. The bug is fixed in version 3.4 (OSG commit 6351e5020371b0b72b300088a5c6772f58379b84)
 2016-02-12 14:46:45 +01:00
scrawl
d3808580b0 Rename lightRoot to sceneRoot 2016-02-10 19:07:47 +01:00
scrawl
5e876b1379 Add missing include 2016-02-10 15:34:06 +01:00
scrawl
0865cea211 Preload terrain 2016-02-09 21:16:11 +01:00
scrawl
596fe56bfd Make Land::loadData thread safe 2016-02-09 20:21:56 +01:00
scrawl
1457a0de78 Use the UnrefQueue to delete BulletShapeInstances 2016-02-09 19:04:59 +01:00
scrawl
e28dc3e72f Preload instances in SceneManager 2016-02-09 18:35:26 +01:00
scrawl
ce3cce24a5 Remove unneeded dynamic_cast 2016-02-09 16:39:05 +01:00
scrawl
8ece1885cd Animation: don't create the NodeMap if we don't need it 2016-02-09 16:39:05 +01:00
scrawl
ae031b23d4 Do not detach NPC parts in destructor 2016-02-09 16:10:42 +01:00
scrawl
d11c2864df Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread 2016-02-09 15:45:35 +01:00
scrawl
1cda2bf796 Preload sky & water from the main menu 2016-02-09 01:28:13 +01:00
scrawl
f9082502f8 Move construction of WorkQueue to RenderingManager 2016-02-09 01:02:40 +01:00
scrawl
1b8e82e929 Preload NPC body parts 2016-02-09 00:26:22 +01:00
scrawl
d855a13b44 Clear the resource cache from the worker thread 2016-02-07 00:36:31 +01:00
scrawl
df57d4bfba Use a common base class for resource managers 
Implement updateCache to delete unreferenced cached objects when they have not been referenced for a while.
 2016-02-06 17:22:17 +01:00
scrawl
499beda665 Clear terrain texture cache before applying filter settings 2016-02-05 23:20:13 +01:00
scrawl
9e53e12c70 More renaming of TextureManager -> ImageManager 2016-02-05 23:10:27 +01:00
scrawl
5ee3d1698f Remove getWarningTexture in favor of getWarningImage 2016-02-05 23:05:43 +01:00
scrawl
f99f403dda Rename TextureManager to ImageManager 2016-02-05 23:03:53 +01:00
scrawl
6ef848b7c5 Remove TextureManager::getTexture2D 
Instead use getImage and let the caller create the Texture. Sharing of textures is then handled in post by the SharedStateManager.

This is closer to what the OSG serializer does.

Streamlines the TextureManager and will make it easier to multithread.
 2016-02-05 23:01:11 +01:00
scrawl
e8662bea31 Change the way that image origin is converted to OpenGL's lower-left convention 
Flip the texture coordinates instead of flipping textures.

This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
 2016-02-05 21:03:11 +01:00
scrawl
5b972ee777 Move texture filtering settings to SceneManager 
Practical benefits:

- Filter settings are now applied to native OSG format models. These models do not use TextureManager::getTexture2D since the model itself specifies a Texture.
- The GUI render manager will be able to use its own separate textures, making it easier to turn off filtering for them.
 2016-02-05 21:03:10 +01:00
scrawl
7d647088ab Make the local map cell distance configurable 2016-02-05 01:19:45 +01:00
scrawl
bd655c20fd Refactor local map updates 
We don't need the delay any more because the rendering itself is part of the normal rendering traversal - so it's delayed anyway.

Don't request maps that we're not actually using (i.e. with cell grid sizes higher than the default 3, we were rendering more maps than the map window could show).
 2016-02-05 01:19:45 +01:00
scrawl
aa9905b0eb Do not crash when the water normal map is missing (Fixes #3179) 2016-02-03 15:24:28 +01:00
scrawl
74c18f532e Fix comment 2016-02-03 14:40:59 +01:00
scrawl
5878291064 Fix the path correction for animation sources provided in NPC record (Fixes #2444) 2016-02-03 14:40:21 +01:00
Alexander "Ace" Olofsson
776c715ccd Move NoTraverseCallback to mwrender/util.hpp 2016-01-29 23:21:58 +01:00
scrawl
aec8c38461 Move observer_ptr include where it belongs 2016-01-25 21:03:33 +01:00
scrawl
fc6fe9acfb Do not crash ModVertexAlphaVisitor when there are no vertex colors 2016-01-25 18:52:20 +01:00
scrawl
87beb73970 Correction 2016-01-15 16:34:57 +01:00
scrawl
fbf07133ea Document usage of node masks 2016-01-15 16:31:24 +01:00
scrawl
41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting 
Conflicts:
	apps/opencs/view/render/instancemode.cpp
 2016-01-15 15:46:10 +01:00
scrawl
3089aeccc4 Factor out SceneUtil::addLight 2016-01-11 23:10:16 +01:00
scrawl
438b30d6f0 Move configureLight to a separate file 2016-01-11 23:10:16 +01:00
scrawl
6546c05428 Move Fallback map to components/ 2016-01-11 23:10:16 +01:00
scrawl
ca4e859f61 Remove unused argument 2016-01-11 22:58:01 +01:00
scrawl
4690fd3f22 Change the local map exploration radius to better match the original engine 2016-01-11 22:57:57 +01:00
scrawl
446c714727 Fix a possible memory leak in error case 2016-01-04 20:39:08 +01:00
scrawl
daa94cc50e Fix cppcheck warnings 2016-01-03 20:19:38 +01:00
scrawl
7a2ca5580a Accept a ConstPtr in RippleSimulation 2015-12-19 15:51:41 +01:00
scrawl
ed101ad35a Remove redundant getPlayerAnimation function 2015-12-18 17:44:57 +01:00
scrawl
7a8a7e3dd6 Add const version of getAnimation 2015-12-18 17:21:51 +01:00
scrawl
7a4aac1842 Use a ConstPtr for the PtrAnimationMap 2015-12-18 17:20:29 +01:00
scrawl
d3d6a69eea Merge pull request #862 from scrawl/const 
ConstPtr
 2015-12-18 15:20:34 +01:00
scrawl
1c8244276d Exception handling improvements (Bug #3090) 2015-12-18 02:36:34 +01:00
scrawl
c9d02c67c0 Remove unneeded const_cast in TerrainStorage 2015-12-17 23:33:47 +01:00
scrawl
fce43854bc Fix last commit 2015-12-17 03:50:15 +01:00
scrawl
0a723ab075 Animation: do not assume the object root is a Group 2015-12-17 03:48:11 +01:00
Chris Robinson
f1faeeae3a Use separate config options for min and mag texture filters 2015-12-13 17:05:19 -08:00
Chris Robinson
5c0a847eaf Combine some duplicate code 2015-12-13 16:51:27 -08:00
Chris Robinson
b830a413d3 Rename the texture filter options 
To avoid compatibility issues with upgrading from or downgrading to older
builds.
 2015-12-13 16:02:09 -08:00
Chris Robinson
76bde5ee13 Separate and expand texture filtering options 2015-12-13 11:25:01 -08:00
scrawl
64424e7262 Move keyframe loading out of SceneManager to new KeyframeManager 2015-12-13 15:31:07 +01:00
scrawl
9bc6f2d5f6 Fix water ripples 2015-12-09 20:35:51 +01:00
Marc Zinnschlag
071ba3a4df Merge remote-tracking branch 'scrawl/werewolf' 2015-12-08 09:28:35 +01:00
scrawl
07b064f616 Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
scrawl
e520d37c87 Override the field of view for first person meshes (Fixes #858, Fixes #3051) 2015-12-07 16:29:30 +01:00
scrawl
9621b66b78 Move field of view setting to Camera section 2015-12-07 16:23:06 +01:00
scrawl
136a425cec Use the Werewolf field of view override (Fixes #3064) 
Need to re-run the settings importer for the feature to work.
 2015-12-07 16:11:47 +01:00
Paul Cercueil
0765ff3ba2 mwrender: Add missing includes 
Those missing includes were causing the build to fail when compiled with
USE_GLES set.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
 2015-12-06 16:01:21 +01:00
scrawl
67a6a8f5d4 Make projectiles receive lighting 2015-12-05 00:44:18 +01:00
scrawl
3f93af4181 Projectiles interact with the water surface (Fixes #2986) 2015-12-04 23:28:11 +01:00
scrawl
8e9571d155 Double buffer the light StateAttributes and StateSets 
Fixes a race condition where the position of a light could jump a frame ahead.
 2015-12-04 00:06:22 +01:00
scrawl
1ec338f19d Don't attempt to load external keyframes for non-NIF files 2015-12-03 20:11:28 +01:00
scrawl
795f6d77f2 Cache the Animation's Skeleton 2015-12-03 20:06:00 +01:00
scrawl
86881bcf39 In first person mode, attach sound listener to the camera 2015-12-03 15:16:20 +01:00
scrawl
f5f3d18b8e Add comment 2015-11-30 17:19:27 +01:00
scrawl
576d5111a5 Prefer Intersector::PROJECTION over Intersector::WINDOW 2015-11-30 17:04:45 +01:00
scrawl
0655abcd8b Fix some character preview raycasting issues (Bug #2769) 2015-11-30 05:43:36 +01:00
scrawl
d2290a8183 Don't crash when Water_SurfaceFrameCount is 0 2015-11-30 00:41:26 +01:00
Marc Zinnschlag
6facce9d13 Merge remote-tracking branch 'origin/master' 2015-11-28 10:02:37 +01:00
scrawl
a1fa1b2b2e Don't attempt to open an empty texture 2015-11-28 06:01:24 +01:00
scrawl
35fa1f5865 Not found Land Textures are no longer a fatal error (Bug #3037) 
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
 2015-11-27 21:57:24 +01:00
scrawl
5b8fd79b4b Fix crash when exception is thrown in startNewGame() 2015-11-27 21:38:57 +01:00
scrawl
62169a7039 Use a single-precision PositionAttitudeTransform in speed critical places 2015-11-22 19:54:26 +01:00
scrawl
61314e1db1 Fix bounding box of bullet debug drawer 2015-11-20 03:04:03 +01:00
scrawl
706b1d4c28 Disable culling of ClipNode 2015-11-20 02:22:37 +01:00
scrawl
8c268f239e Set the object node scale before inserting model 
This fixes initWorldSpaceParticles not taking object scale into account. Still not taking into account object rotation or node animations. Ideally the initWorldSpaceParticles needs to run in an updateCallback.
 2015-11-19 15:57:12 +01:00
scrawl
eb2f16d682 Support for loading .osg mesh format 2015-11-16 23:26:43 +01:00
scrawl
0f347eccbf Flip the origin of global map texture 
Now it's consistent with the overlay texture.
 2015-11-15 21:36:41 +01:00
scrawl
8b7bdcd127 Fix the global map overlay viewport (Bug #3018) 2015-11-15 21:32:34 +01:00
scrawl
a68fd791c8 Remove a stray method declaration 2015-11-11 17:24:27 +01:00
scrawl
79c44d0bfe Style fix 2015-11-11 17:23:47 +01:00
scrawl
02148a43f5 Node mask fix 2015-11-11 17:22:31 +01:00
scrawl
0a52ee17c3 Fix Drawable removal issues 2015-11-11 17:04:06 +01:00
scrawl
afa590bddb Leak fix 2015-11-11 16:04:17 +01:00
scrawl
c62c1693e9 Disable copy constructor and operator= in PartHolder 2015-11-11 01:47:26 +01:00
scrawl
2e9805fa0e Leak fix 2015-11-11 00:50:57 +01:00
scrawl
b840c68f0c Do not create a depth buffer for the global map 2d rendering 2015-11-10 21:55:21 +01:00
scrawl
8e3bc981a2 Fix self-referencing camera 2015-11-10 21:45:53 +01:00
scrawl
0409e5a043 Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change) 2015-11-10 18:28:58 +01:00
scrawl
f1ac408f35 Place Drawables directly in the scene graph when built with OSG 3.4 
OSG 3.4 adds the ability to place Drawables directly in the scene graph, without a Geode decorating them. Leveraging this should give a small performance boost, because the redundant Geodes increase culling overhead.

There is still an oustanding issue with the RemoveDrawableVisitor no longer working correctly, because Drawables can have multiple parents.
 2015-11-10 18:23:42 +01:00
scrawl
35459f20d5 Refactor lighting mask 2015-11-10 17:23:12 +01:00
scrawl
91583fc027 Fix MWRender::Mask_ParticleSystem 2015-11-10 17:00:33 +01:00
scrawl
637cd3a628 Adjust the FirstPersonNeckController to follow the camera with a reduced factor (Fixes #1784) 2015-11-10 01:01:41 +01:00
scrawl
1b52749ae1 Adjust third person camera height based on character height 2015-11-09 17:42:35 +01:00
scrawl
055841e721 Improve cloud lighting 2015-11-09 02:22:40 +01:00
scrawl
2407f393ce Fix double update traversal in screenshot function 2015-11-06 23:14:27 +01:00
scrawl
6e69808129 Fix the frameNumber not being incremented in certain frames 2015-11-06 23:14:27 +01:00
scrawl
c996702b56 Fix some uninitialised variables found by static analysis 2015-11-04 20:34:50 +01:00
scrawl
1cf1c944b7 Don't attempt to render weather particles on the refraction and reflection textures 2015-11-03 23:20:17 +01:00
scrawl
209fa52883 Hide weather particles underwater (Fixes #2701) 2015-11-03 23:15:43 +01:00
scrawl
e3b30baff9 clipFudge fix 2015-11-03 23:10:52 +01:00
scrawl
c0a81030bb Make use of INI settings for the simple water 2015-11-03 02:24:50 +01:00
scrawl
30c828dff0 Include cleanup 2015-11-03 02:17:42 +01:00
scrawl
8e8f72408d Use diffuse/ambient lighting for the simple water 2015-11-03 02:12:00 +01:00
scrawl
380256977b Fix another renderBin issue with the weather particles 
Depth sorting w.r.t. the rest of the scene was broken
 2015-11-03 01:53:38 +01:00
scrawl
9902dfc9ef Comment 2015-11-03 01:53:22 +01:00
scrawl
ad016da31d Enable fog on weather particles 2015-11-03 01:42:37 +01:00
scrawl
fd1ccd21ff Disable freezeOnCull for weather particles 2015-11-02 23:49:22 +01:00
scrawl
5ca0ae5232 Don't add the same AlphaFader to multiple nodes 2015-11-02 23:38:34 +01:00
scrawl
d6f45c3390 Fix the renderbin for weather particles 
Regression from commit 2ee6b41887
 2015-11-02 21:51:01 +01:00
scrawl
bd1f3493d7 Fix weather particles not being cleared when changing from one particle effect to another 2015-11-02 21:35:03 +01:00
scrawl
0348b8df1c Fix applying of plane height in ClipCullNode (Fixes #2985) 2015-11-02 01:23:21 +01:00
scrawl
3f988327c7 Destructor fix 2015-11-02 00:57:59 +01:00
scrawl
913bbe347b Don't check the extension string every frame 2015-11-02 00:52:20 +01:00
scrawl
c60388afb6 Add fudge factor to move the water mesh away from camera when the camera gets too close 2015-11-02 00:34:09 +01:00
scrawl
4690ec12cc Render the water plane with GL_DEPTH_CLAMP if supported (Fixes #996) 2015-11-02 00:29:09 +01:00
scrawl
8da4530957 Use INI-imported underwater fog settings (Fixes #2907, Fixes #1511) 2015-11-01 22:09:27 +01:00
scrawl
bd9dc58560 Use the correct scale for actor swim height (Fixes #2833) 2015-11-01 21:45:58 +01:00
scrawl
7b817ba010 Fix the node masks of water cameras being reset (Bug #2984) 
Node mask needs to remain Mask_RenderToTexture so the raytesting visitor won't go through the reflection graph.
 2015-10-31 03:14:05 +01:00
scrawl
93f4d31cf9 Raytest mask fix (Fixes #2984) 2015-10-31 01:30:02 +01:00
scrawl
b9b154a015 Minor cleanup 2015-10-31 00:01:12 +01:00
scrawl
d90fa977e8 GL_DEPTH_COMPONEN24 fix 2015-10-29 13:52:48 +01:00
scrawl
7692ae175a Disable sun rendering on the reflection camera 
Not needed, we have specular highlights.
 2015-10-29 01:17:23 +01:00
scrawl
9b8e45fc01 Fix ripple particles z-fighting with the water surface 2015-10-29 00:28:09 +01:00
scrawl
d394b0793f waterLevel fix 2015-10-29 00:27:42 +01:00
scrawl
c9d7078b4b Water: add texture quality setting to the settings window 2015-10-29 00:27:42 +01:00
scrawl
8433e0679f Water: connect to settings window 2015-10-29 00:25:24 +01:00
scrawl
9f8d36b573 Water code cleanup 2015-10-29 00:25:24 +01:00
scrawl
11c997d09d Water: move reflection code to a new class 2015-10-29 00:25:24 +01:00
scrawl
ebdf25ccb9 Water: move refraction code to a new class 2015-10-29 00:25:24 +01:00
scrawl
7bbdb13138 Remove debug code 2015-10-29 00:25:24 +01:00
scrawl
6ba9f561ea Use simple water for the local map 2015-10-29 00:25:24 +01:00
scrawl
09631385c3 Use boost ifstream for water resources 2015-10-29 00:25:24 +01:00
scrawl
d485dd0782 Water: fix world UV coords 2015-10-29 00:25:24 +01:00
scrawl
9f2f503d37 Water: pass the near and far planes 2015-10-29 00:25:24 +01:00
scrawl
37c9c12962 Water: clipping plane offset 2015-10-29 00:25:23 +01:00
scrawl
700a0099c3 Remove debug code 2015-10-29 00:25:23 +01:00
scrawl
e13eb625d3 New water WIP 
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader

Still to do: see comments...
 2015-10-29 00:25:23 +01:00
scrawl
515c52211e Disable mipmaps for temporary screenshot texture 2015-10-25 18:28:50 +01:00
scrawl
ef5838df7e SunGlareCallback: Fix incorrect view matrix for RELATIVE_RF cameras 2015-10-24 15:46:15 +02:00
scrawl
6ef139e1d7 Implement a custom RenderBin for first person models (Fixes #1612) 2015-10-19 22:17:04 +02:00
scrawl
ee450471fd Disable head controller for non-bipedal creatures (Fixes #2843, Fixes #2966) 2015-10-13 17:55:57 +02:00
scrawl
a88d56148b Read the Sun Glare Fader ini settings 2015-10-13 16:35:31 +02:00
Alexander "Ace" Olofsson
7d4125d97f Fixes for building with unity build 2015-09-24 15:21:42 +02:00
scrawl
385f4f729c Implement SunDiscSunsetColor, fade the sun during sunrise & sunset 2015-09-21 19:43:48 +02:00
scrawl
1a1f1fae87 Minor cleanup 2015-09-21 17:50:36 +02:00
scrawl
d812434fee Add a subtle fading effect to the sun flash texture 2015-09-21 17:48:24 +02:00
scrawl
854fd9fe05 Remove dead code 2015-09-21 17:20:09 +02:00
scrawl
9bb6c3f288 Improve accuracy of sun occlusion query (use circular shape) 2015-09-21 17:20:09 +02:00
scrawl
96b31d3bba Scale the sun flash texture depending on occlusion query 2015-09-21 17:20:08 +02:00
scrawl
a2a4532e71 Add the full-screen sun glare effect 2015-09-21 17:20:08 +02:00
scrawl
ac5d0bf405 Render the sun flash (not adjusted based on occlusion yet) 2015-09-21 17:20:08 +02:00
scrawl
89d9323c2b Document RenderBin numbers in a common header to keep them organised 2015-09-21 17:20:08 +02:00
scrawl
d191a52847 Create occlusion query nodes for the sun flash 2015-09-21 17:20:08 +02:00
scrawl
6bafa564d4 Move sun texture setting out of the Updater class so we can reuse the Updater for fading the flash texture 2015-09-21 17:19:53 +02:00
scrawl
a37dee09e2 Fix invisibility effect disappearing after a view mode switch 2015-09-18 21:30:02 +02:00
scrawl
f8d4bc378f Move setAlpha from NpcAnimation to Animation (Fixes #2917) 2015-09-16 16:15:55 +02:00
scrawl
126960261f Keep playing IdleSneak on the lower body when casting spells / using weapons 2015-09-16 16:14:17 +02:00
scrawl
5692ef1eae Add convenience operator [] to AnimPriority 2015-09-16 15:43:42 +02:00
Marc Zinnschlag
2c37731494 Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-09-12 08:41:12 +02:00
dteviot
8e2fe1985d Fixed errors pointed out by Zini. 
1. Removed "Actor" from name of function  isActorNearInactiveCell().
2. Corrected case of CoordinateConverter member function names.
 2015-09-12 14:17:46 +12:00
Marc Zinnschlag
0ff786bebd Merge remote-tracking branch 'origin/master' 2015-09-11 13:22:31 +02:00
Marc Zinnschlag
a445683312 Merge branch 'mergetool' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
 2015-09-11 13:22:15 +02:00
slothlife
29d74f0249 Improve thunderstorm support. 
Reversed settings for thunderstorms. Added thunder support to all
weather types. Implemented a simple lightning flash effect similar to
MW.
 2015-09-08 22:05:33 -05:00
Marc Zinnschlag
69b9eadb52 refactored loading of land data 2015-08-31 16:13:26 +02:00
Marc Zinnschlag
febf611c82 made return type of ESMTerrain::Storage::getLand const 2015-08-31 14:17:11 +02:00
Marc Zinnschlag
a52b947efe Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-08-23 12:11:30 +02:00
Marc Zinnschlag
50ec8b10f5 Merge remote-tracking branch 'dteviot/Bug2871' 2015-08-22 10:37:43 +02:00
dteviot
3fa5c6a0e7 fixed travis build failure 2015-08-21 22:00:08 +12:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
dteviot
85bc41dedb replaced FLT_MAX with numeric_limits. 2015-08-21 19:34:28 +12:00
scrawl
af3b0cd883 Improve some error messages 2015-08-21 00:31:43 +02:00
scrawl
681183df31 Restore handling of fog depth == 0 values (Bug #1549) 2015-08-19 01:13:14 +02:00
Marc Zinnschlag
3992125b61 Merge remote-tracking branch 'scrawl/master' 2015-08-17 14:05:51 +02:00
dteviot
942a987d52 centralize the world/cell coordinate conversion logic. 2015-08-16 18:55:02 +12:00
scrawl
58cd2b1a84 Remove "Tri Bip*" nodes in creature meshes (meant for debugging)? (Fixes #2148) 2015-08-15 19:01:21 +02:00
scrawl
56b7196bea Remove incorrect implementation of "Clouds Maximum Percent" weather setting 2015-08-07 15:34:01 +02:00
slothlife
3235cecddf Use Glare View for visibility of celestial bodies 
Fixed memory leak from Sun and Moon objects by pulling Updaters back out
into separate objects. Removed code related to
mCelestialBodyTransparency.
 2015-08-07 00:08:18 -05:00
slothlife
238ae419a3 Fix use of incorrect material for Sun 2015-08-05 22:02:54 -05:00
slothlife
f2e51b0579 Use diffuse alpha to fade Sun 2015-08-05 21:03:21 -05:00
slothlife
ea2f88a355 Fix several sky rendering bugs, maybe also #639 
Added code to hide the moons, sun, and stars for certain weather
effects. Lightly refactored CelestialBody and derived classes. Fixed
moons switching phase at 24:00.
 2015-08-04 21:07:42 -05:00
scrawl
664ae079db Improve setting of culling mask for the savegame screenshot camera 2015-08-02 18:05:15 +02:00
scrawl
88c61ed2b6 Fix NotifyDrawCompletedCallback in single threaded mode 2015-08-02 17:57:50 +02:00
Marc Zinnschlag
e73c115ff5 Merge remote-tracking branch 'origin/master' 2015-08-02 13:44:17 +02:00
Marc Zinnschlag
9ee3f1bfe7 Merge remote-tracking branch 'slothlife/moon-settings' into mergetool 2015-08-02 13:42:39 +02:00
slothlife
0244a9b329 Correct moon texture with respect to trajectory 2015-08-01 07:57:05 -05:00
Marc Zinnschlag
9392e426c0 Merge remote-tracking branch 'origin/master' into mergetool 2015-08-01 10:16:20 +02:00
scrawl
1f755a2bc0 Don't use a shared Material in AlphaFader 2015-07-31 00:03:01 +02:00
slothlife
24ba54f4fe Implement accurate moon settings (fixes #672) 2015-07-29 23:57:45 -05:00
scrawl
278076e609 Include cleanup 2015-07-25 04:14:22 +02:00
scrawl
a33ca75742 Pass AnimPriority by const reference 2015-07-18 03:23:41 +02:00
scrawl
f6f82d433c Fix bug with loop key assignment 
Animations with time of "loop start" == time of "loop stop" were not getting their loop times assigned correctly.

This fixes incorrect playing of the jump animation, one aspect of Bug #2286.
 2015-07-16 19:55:05 +02:00
scrawl
3656851750 Remove the now unused changeBlendMask 2015-07-15 16:43:11 +02:00
scrawl
50db6ed396 Use the extended animation priority for weapon animations 2015-07-15 14:40:36 +02:00
scrawl
e93a578f23 Extend the animation priority system to one priority value per bone group / distinct blend mask 2015-07-15 14:18:31 +02:00
scrawl
335ef97cf5 Rename Animation::Group to Animation::BlendMask 
The old naming is problematic, because the term group was being used for another feature (text key groups) already.
 2015-07-15 13:49:16 +02:00
scrawl
24ae1d5ace Fix some issues found by coverity 2015-07-11 03:34:08 +02:00
scrawl
667c80fb2a Add brackets around a correct expression to fix coverity warning 2015-07-11 03:34:08 +02:00
scrawl
ebdd5dc993 Fix code that I forgot to uncomment (thanks coverity) 2015-07-11 03:34:08 +02:00
scrawl
49c07de773 Merge pull request #643 from ace13/win-build-fix 
Fix build error and a pair of warnings
 2015-07-05 22:24:24 +02:00
Alexander "Ace" Olofsson
aaaee74a4d Fix the comments 2015-07-05 21:56:04 +02:00
Marc Zinnschlag
432384d280 Merge remote-tracking branch 'scrawl/aicombat' 2015-07-05 14:47:20 +02:00
scrawl
c90841d649 Fix head tracking for NPCs 2015-07-04 21:00:01 +02:00
scrawl
6724585777 Light magic effect 
Notable change compared to the old (Ogre) effect: uses the ambient instead of diffuse term (Fixes #2364)
 2015-07-02 20:46:34 +02:00
scrawl
bf9c62fa42 Fix for some coverity scan defects 2015-07-02 20:46:34 +02:00
scrawl
dcb8fbc69c Accurate handling of fog depth/density (Fixes #2752) 2015-07-02 20:46:34 +02:00
Alexander "Ace" Olofsson
5d24091364 Fix build error and a pair of warnings 
The error was about casting between osg::Callback* and osg::NodeCallback*
The warnings are both about virtual classes with non-virtual destructors
 2015-07-01 15:06:38 +02:00
scrawl
4b2391c60f Ignore effect meshes in getScreenBounds 2015-06-30 02:51:32 +02:00
scrawl
d5a47cfafe Include cleanup 2015-06-30 01:41:03 +02:00
scrawl
017c9f7ac9 Fading for weather particle effects 2015-06-29 20:19:46 +02:00
scrawl
882e359008 Move attackStrength to the CharacterController, where it should have been to begin with 
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
 2015-06-26 05:15:07 +02:00
scrawl
4ef6aa6b7f Fix weather particles disappearing 2015-06-26 02:30:39 +02:00
scrawl
8a3889a81e Rain fading 2015-06-25 17:38:12 +02:00
scrawl
3a21f05f6e Rain effect 2015-06-25 17:23:01 +02:00
scrawl
d7695f2560 Remove unused NpcAnimation visibilityFlags 2015-06-22 21:14:44 +02:00
scrawl
d5b73f2a55 Move HeadAnimationTime to the implementation file 2015-06-22 21:12:15 +02:00
scrawl
24bfb44b13 Move head tracking from NpcAnimation to Animation (Bug #2720) 2015-06-22 21:06:27 +02:00
scrawl
ad6764fa6a Fix bug #2715 2015-06-20 17:08:46 +02:00
scrawl
efad4efe19 Star fading (Bug #2693) 2015-06-19 20:55:04 +02:00
scrawl
74260a9a44 Tweak moon sizes 2015-06-19 20:30:04 +02:00
scrawl
f5c50aa581 Disable FreezeOnCull for effect particles 2015-06-19 18:38:44 +02:00
scrawl
1ed4e33815 Fading for mooncircle texture 2015-06-19 18:19:52 +02:00
scrawl
2b53e5d965 Fix for explosion effects playing when the game is paused 2015-06-19 03:32:48 +02:00
scrawl
e0dfc1425e Correct moon blending 2015-06-19 02:51:01 +02:00
scrawl
0c4ebee6b3 Cloud opacity & cross-fading 2015-06-19 01:03:12 +02:00
scrawl
fb94395628 Fix atmosphere lighting 2015-06-18 23:15:13 +02:00
scrawl
fabc5126f3 Include cleanup 2015-06-18 00:30:51 +02:00
scrawl
0ffa1f964b Fix water ripple height 2015-06-17 22:49:20 +02:00
scrawl
3ebfb4e0d9 Ignore particle systems in getScreenBounds 2015-06-17 18:22:31 +02:00
scrawl
b543308e3e Remove an already resolved todo comment 2015-06-17 18:16:05 +02:00
scrawl
b648722d3b Don't use the ParticleSystem for computing placeable bounds (Bug #2700) 2015-06-17 15:13:41 +02:00
scrawl
7b35882814 RemoveParticlesVisitor fix 2015-06-17 15:13:17 +02:00
scrawl
1c151f2f0a Re-enable some outcommented sky code 2015-06-16 20:56:48 +02:00
scrawl
3da8f6e62e Water ripples 2015-06-16 20:36:48 +02:00
scrawl
b73947033d Rotate sky meshes 2015-06-16 16:33:31 +02:00
scrawl
2d072aab2d Broken bone references from .kf files are no longer a fatal error (Bug #2687) 2015-06-15 22:42:14 +02:00
scrawl
a5b72a358b Prune empty nodes in RemoveDrawableVisitor 
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
 2015-06-14 23:56:35 +02:00
scrawl
f017fd6860 Reduce includes in animation.hpp 2015-06-14 23:13:26 +02:00
scrawl
b90fc8ad92 Fix for various Viewer::frame calls resetting the simulationTime 2015-06-14 18:19:53 +02:00
scrawl
76bdf7a5b7 Add night-eye effect 2015-06-11 23:16:05 +02:00
scrawl
c94c87d409 Attach effects to the insert node instead of the object root (Bug #2654) 2015-06-11 16:22:09 +02:00
scrawl
c7493eb45c Fix bug with invisibility effect for meshes w/ vertex colors 2015-06-11 16:14:51 +02:00
scrawl
bf02c7f6e4 Sun visibility fix 2015-06-07 19:28:12 +02:00
scrawl
508c57d6e2 addEffect crash fix for objects with no model 2015-06-07 17:09:37 +02:00
scrawl
b33fe8fb62 Fix the inventory listener bug 2015-06-07 16:50:34 +02:00
scrawl
0a411cbd7c Enable particle lighting 2015-06-07 04:41:55 +02:00
scrawl
ddfed35d1c Object placement raycasts should use the rendering meshes 2015-06-05 02:26:16 +02:00
scrawl
30ab15e605 Fix -Wunused-private-field clang warnings 2015-06-04 20:42:05 +02:00
scrawl
869f8a329a Cloud scrolling fix 2015-06-04 20:08:44 +02:00
scrawl
ce0d93caed Fix for "GlobalMap trying to erase an inactive camera" spam in main menu 2015-06-04 16:32:21 +02:00
scrawl
b70383d127 Remove last remains of Ogre math 2015-06-03 21:37:21 +02:00
scrawl
2a85a22dba Write savegame screenshot 2015-06-03 16:40:16 +02:00
scrawl
24551c7bab Fix for savegame incompatibility with master branch 2015-06-03 14:56:57 +02:00
scrawl
41cce5240f Delete remaining files that won't be of any use 2015-06-03 03:29:21 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
scrawl
8c50f8ed26 Fix for lights with no mesh 2015-06-02 17:06:55 +02:00
scrawl
5a7f2a4f1f Restore light attenuation settings 2015-06-02 17:02:56 +02:00
scrawl
01944c33f5 Basic water rendering 2015-06-02 16:35:35 +02:00
scrawl
c85764b654 Wireframe mode 2015-06-01 17:02:44 +02:00
scrawl
7f9f9a32d2 InitWorldSpaceParticles fix 2015-06-01 16:29:42 +02:00
scrawl
987918ca15 NpcAnimation::setAlpha 2015-06-01 16:18:57 +02:00
scrawl
bed31996c9 Camera raycast 2015-06-01 15:34:46 +02:00
scrawl
2869424847 Fix first person camera for beast races 2015-06-01 04:41:03 +02:00
scrawl
ccd95419e5 Restore various raycasting 2015-06-01 01:57:15 +02:00
scrawl
5b846ebc71 Camera precision fix 2015-05-31 23:09:37 +02:00
scrawl
ed4863ad7d Restore ranged weapon aiming 2015-05-31 18:53:16 +02:00
scrawl
71bafcb52b Restore head tracking 2015-05-31 18:04:14 +02:00
Marc Zinnschlag
9f0ccdc37a Merge remote-tracking branch 'scrawl/master' 2015-05-31 11:05:43 +02:00
scrawl
60f55997fd Rotate first person meshes, sneak camera offset in first person 2015-05-31 02:26:58 +02:00
scrawl
a066b24303 Restore WeaponAnimation 2015-05-31 01:07:43 +02:00
scrawl
988a9cad58 getHitContact Head exception fix 2015-05-30 01:41:38 +02:00
scrawl
5c7ecb9c1d string::compare exception fix 2015-05-29 23:38:31 +02:00
scrawl
af2f26d04d Particle fixes 2015-05-29 20:45:27 +02:00
scrawl
7e715decd3 Color fix 2015-05-29 02:26:58 +02:00
scrawl
6d3528af70 Port global map exploration 2015-05-29 01:49:52 +02:00
scrawl
7a1408cfed Restore display of global map overlay, no exploration yet 2015-05-28 18:49:24 +02:00
scrawl
5f7a82e0da Fog of war fix 2015-05-28 16:20:29 +02:00
scrawl
f4ee805e3b Object animation fix 2015-05-28 15:44:58 +02:00
scrawl
c811ac6afe Port fog of war 
Not optimized yet, need to work on fog texture's DataVariance.
 2015-05-28 03:50:49 +02:00
scrawl
5628a2b823 Camera zoom fix 2015-05-28 03:47:53 +02:00
scrawl
1f00174c02 Use a btCollisionWorld instead of btDiscreteDynamicsWorld 
Slightly improves performance, since we no longer need to stepSimulation(). We don't use any Dynamics (yet).
 2015-05-27 23:09:38 +02:00
scrawl
fe439e53ff Bullet include cleanup 2015-05-27 22:32:11 +02:00
scrawl
2f97649540 Fix for cleanup issue when exiting after a failed savegame load (Fixes #2580) 2015-05-27 00:30:39 +02:00
scrawl
723beb1cac Move IncrementalCompileOperation to SceneManager 2015-05-26 20:20:18 +02:00
scrawl
099f93f00d Sky fixes 2015-05-26 18:22:21 +02:00
scrawl
c4951d1e73 Map rotation fix 2015-05-26 18:10:31 +02:00
scrawl
3dcb167066 Map rendering 2015-05-26 16:40:44 +02:00
scrawl
1fd9fba7a3 Fix debug drawer crash 2015-05-24 04:28:34 +02:00
scrawl
95465a1489 Player raycast fix 2015-05-24 04:01:36 +02:00
scrawl
8b322fcd06 Implement getFacedObject using osgUtil::IntersectionVisitor 2015-05-24 03:36:34 +02:00
scrawl
c2131e7c31 Make near clip distance configurable 2015-05-24 02:34:20 +02:00
scrawl
152d690a7a Minor cleanup 2015-05-23 23:10:53 +02:00
scrawl
da24e298ee Fix -Wreorder warnings 2015-05-23 22:44:00 +02:00
scrawl
22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
 2015-05-23 20:33:44 +02:00
scrawl
0b042b75cc Restore actor visibility mask 2015-05-23 05:42:37 +02:00
scrawl
8092f37ce5 New game crash fix 2015-05-23 05:40:24 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scrawl
85345e663a Restore getHitContact 2015-05-22 04:36:33 +02:00
scrawl
627fee07bc Minor cleanup 2015-05-22 04:36:33 +02:00
scrawl
d6da5c8007 Fix for crosshair not showing 2015-05-22 04:36:33 +02:00
scrawl
5ea61af6ac Fix for applying view distance 2015-05-22 04:36:33 +02:00
scrawl
2235d2978b Restore animation text key handling 2015-05-22 04:36:33 +02:00
scrawl
9b8e2e9db3 Port MWRender::Camera 2015-05-22 00:29:27 +02:00
scrawl
0fb97bd2e7 Readded baseonly parameter to Animation::setObjectRoot 
Fixes the first person view.
 2015-05-21 23:24:22 +02:00
scrawl
cfe57199d7 Minor cleanup 2015-05-20 04:09:21 +02:00
scrawl
c4452afd89 Inventory item picking 2015-05-20 04:09:21 +02:00
scrawl
72c1f37527 Port CharacterPreview 2015-05-20 02:18:20 +02:00
scrawl
820f4a2688 Fix light direction 2015-05-20 02:07:18 +02:00
scrawl
75ace9f8b5 Global map base layer 2015-05-16 14:48:20 +02:00
scrawl
24bb2e152c Apply texture filter setting changes 2015-05-14 21:42:04 +02:00
scrawl
3e86dd7df0 Apply runtime changes to field of view & view distance 2015-05-14 18:46:28 +02:00
scrawl
b7258c8d23 Readded Objects::updatePtr 2015-05-14 17:34:55 +02:00
scrawl
4ad0b83aa5 Eliminate string lookups in AnimationTime 2015-05-14 16:33:41 +02:00
scrawl
ccab8cc9a1 Register Player in the PhysicsSystem 2015-05-12 17:40:42 +02:00
scrawl
77f733362c Add stats graphs for Script, Mechanics and Physics timings 2015-05-07 21:57:02 +02:00
scrawl
100d6e5fff Render MyGUI in background thread, i.e. refactor to get rid of DYNAMIC DataVariance 2015-05-05 02:38:59 +02:00
scrawl
e191f0e044 Rename MWRender::Debugging to MWRender::Pathgrid 2015-05-04 17:41:30 +02:00
scrawl
e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
 2015-05-04 02:41:50 +02:00
scrawl
9de575ad42 Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen 
For now, not much difference, but should result in a sizable speed up once MyGUI no longer needs the DYNAMIC flag (i.e. the loading screen truly renders in the background).
 2015-05-03 18:16:54 +02:00
scrawl
283b252142 Stub InputManager 2015-05-03 17:24:35 +02:00
scrawl
1943110170 Add bullet debug drawer 2015-05-03 00:39:01 +02:00
scrawl
9cf9c2876e Pathgrid rendering 2015-05-02 22:45:39 +02:00
scrawl
bd8f0248f0 Player rendering 2015-05-01 18:21:50 +02:00
scrawl
62847f0489 Use node masks to separate Scene and GUI 2015-05-01 01:44:21 +02:00
scrawl
83c6ba97c0 Disable skinning updates for actors beyond the AI processing distance 2015-04-30 00:10:24 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
scrawl
8971a200f7 Sky fix 2015-04-26 14:34:14 +02:00
scrawl
0ff7b2ff11 MechanicsManager, frame update 2015-04-25 15:19:17 +02:00
scrawl
2db097f80e Fix nested callbacks bug 2015-04-25 15:10:37 +02:00
scrawl
a3417a9c49 CharacterController compiles 2015-04-25 01:20:07 +02:00
scrawl
42d6c6140c Add mygui backend by chris 2015-04-24 21:55:30 +02:00
scrawl
1c0e3a6488 rotateObject, scaleObject 2015-04-23 23:50:46 +02:00
scrawl
6f3e920f85 Animation port complete 2015-04-23 23:30:06 +02:00
scrawl
86b4a610cb Movement accumulation works 2015-04-23 22:46:07 +02:00
scrawl
09742d5b95 Animation playback works, no movement accumulation yet 2015-04-23 20:41:31 +02:00
scrawl
1a19cd3607 Some cleanup 2015-04-22 19:08:56 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
7a46d4f46a Dead code removal 2015-04-22 17:48:06 +02:00
scrawl
04accb7652 Add LightController 2015-04-22 17:37:39 +02:00
scrawl
dfd8e08698 Dead code removal 2015-04-21 23:40:10 +02:00
scrawl
26766b8e0a Dead code removal 2015-04-21 23:36:36 +02:00
scrawl
9e177df61b Add fog, view distance, and far plane culling 2015-04-21 23:36:36 +02:00
scrawl
42f6d9e15b Port video player 2015-04-19 20:07:18 +02:00
scrawl
68f93294da Port EffectManager 2015-04-19 17:55:56 +02:00
scrawl
fcc7aa02ab Port addExtraLight 2015-04-19 15:03:08 +02:00
scrawl
c924e64047 Port HeadAnimationTime 2015-04-19 14:42:47 +02:00
scrawl
f7d2a28930 Port BoneOffset 2015-04-19 14:25:36 +02:00
scrawl
9c4b2ea61a CreatureAnimation compiles 2015-04-19 03:05:47 +02:00
scrawl
edc5cad79e Port Animation::addEffect 2015-04-19 01:57:52 +02:00
scrawl
083c41c950 Environment map for enchanted objects 2015-04-17 01:23:37 +02:00
scrawl
c334a76a6f Fix skinning bug 2015-04-15 22:38:43 +02:00
scrawl
5b8c28f641 NpcAnimation compiles 2015-04-15 22:11:38 +02:00
scrawl
13a1ba0aab Moon rendering 2015-04-15 18:50:50 +02:00
scrawl
c516e897ee Move Controller base classes to SceneUtil, add visitor to assign ControllerSources 2015-04-14 17:51:46 +02:00
scrawl
5dd1ab24fe More efficient StateSetController, beginnings of sky rendering 2015-04-14 15:58:16 +02:00
scrawl
246b06ca27 Forgot to add 2015-04-13 17:30:32 +02:00
scrawl
61aaf0cf70 Attach light lists to the object base nodes instead of each renderable 
Apparently that is how Ogre worked (on the SceneNode) so let's roll with it for now. Have not tested yet what MW does.
 2015-04-12 18:03:36 +02:00
scrawl
c92592493e OpenMW: create a window and render the starting cell(s) 2015-04-12 15:38:30 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
dteviot
3f28634d1f consolidate random number logic 
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
 2015-03-15 14:07:47 +13:00
scrawl
3879ce6ac1 Get rid of "player" string checks (Fixes #2216) 2015-03-11 23:07:39 +01:00
dteviot
f19863b545 fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 18:11:54 +13:00
dteviot
ca8c8c6aa4 fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 17:42:07 +13:00
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 13:07:29 +13:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
dteviot
407cd50890 fixed warning C4099: 
type name first seen using 'class' now seen using 'struct'
 2015-03-06 21:36:42 +13:00
Marc Zinnschlag
8b84fa5579 Merge remote-tracking branch 'scrawl/master' 2015-03-02 20:01:31 +01:00
scrawl
191c0104f6 Crash fix for creatures with no skeleton base (Fixes #2419) 2015-03-02 15:19:57 +01:00
sylar
1bb29f610f enable mipmapping for Android again 2015-02-26 18:29:38 +04:00
scrawl
37a85e31d6 Ripples fix 2015-02-14 16:51:47 +01:00
scrawl
93ffdb427c Small tweak to ripples 2015-02-14 15:53:01 +01:00
scrawl
c27c20a859 Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	files/materials/water.shader
 2015-02-09 19:40:59 +01:00
scrawl
dbd4abd6fe Fix ripples for D3D - added simpler effect (Fixes #1649) 2015-02-09 19:30:11 +01:00
Marc Zinnschlag
e9d6e4f6df Merge remote-tracking branch 'ace/include-cleanup' 2015-02-09 18:03:28 +01:00
scrawl
e81d2a9dde Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
 2015-02-08 21:28:29 +01:00
scrawl
01e32aef79 Fix exception moving a disabled object between cells 2015-02-08 14:34:31 +01:00
Jordan Ayers
2d17eaa5ea Fix argument name for setSunDirection. 2015-02-06 22:26:58 -06:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
scrawl
7e33471edb Fix code duplication 2015-01-31 22:40:43 +01:00
scrawl
56799c79f4 Fix attachArrow exception when changing weapon (Fixes #2332) 2015-01-31 22:40:42 +01:00
scrawl
326eaea8a6 Add missing sound for drawing throwing weapons (Fixes #2308) 2015-01-31 22:40:40 +01:00
scrawl
5a9b30a8ca Don't show VFX on the map (Fixes #2324) 2015-01-31 22:40:38 +01:00
scrawl
417f60f467 Use the mooncircle textures (Fixes #1624, Fixes #1743) 2015-01-31 22:40:38 +01:00
scrawl
dac1290597 Reduce size of water plane and increase subdivisions (Fixes #969) 2015-01-31 22:40:37 +01:00
scrawl
e712b0353b Terrain refactoring, reduce game startup time and memory usage 2015-01-29 03:39:01 +01:00
scrawl
62a32220ff Use low-LOD heightmap for world map rendering 
Add vanilla-accurate colour palette (thanks Hrnchamd)
 2015-01-29 03:39:01 +01:00
scrawl
f4c8064d39 Fix camera not being attached properly when player becomes vampire (Fixes #2319) 2015-01-28 19:14:57 +01:00
scrawl
b0c2aec374 Add warning for missing body parts 2015-01-23 17:31:26 +01:00
scrawl
cc7be1600d Make missing hair/head in NpcAnimation non-fatal for consistency with addOrReplaceIndividualPart 2015-01-23 15:34:14 +01:00
scrawl
41b3a9dba9 Rewrite animated collision shape support (Fixes #2123) 2015-01-13 05:37:37 +01:00
scrawl
08d8dd287c I think this was committed by accident 2015-01-12 23:29:58 +01:00
scrawl
de23ad5c8d Change dynamic_cast to static_cast to make coverity happy 2015-01-12 23:29:58 +01:00
scrawl
c3f3f8b3d0 Use only Cell records for saving progress bar (Fixes #2259) 2015-01-11 18:01:06 +01:00
scrawl
91571f51be Ogre crash workaround (Fixes #1745) 2015-01-10 22:45:08 +01:00
scrawl
ef7e0070a6 Don't right-shift signed integers which is implementation-defined 2015-01-08 16:27:13 +01:00
scrawl
dc5ed5b861 Remove weather particles underwater (Fixes #2010) 2015-01-07 02:34:29 +01:00
scrawl
398fe6e780 Thrown weapon fix (Fixes #2248) 2015-01-04 19:20:24 +01:00
scrawl
d56906acf7 Fix the creature position glitch 2015-01-03 19:10:15 +01:00
scrawl
6f747df713 Remove an unused constructor 2015-01-03 19:10:15 +01:00
Marc Zinnschlag
9f6a2d00e8 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2015-01-02 18:17:25 +01:00
Marc Zinnschlag
ec1df719fe Merge remote-tracking branch 'mrcheko/master' 2015-01-02 18:08:47 +01:00
mrcheko
a8621e6230 defaults are set to 1.0; remove contrast setting 
(can be changed in config though); disable gamma control for not Windows
OSs
 2015-01-02 16:49:22 +03:00
Thoronador
526fb1b37b fix uninitialized value in BillboardObject 2015-01-02 00:45:50 +01:00
scrawl
5d7eb11596 Fix lights being rendered on the map (broken by d55fe43fc9) 2014-12-31 21:04:13 +01:00
scrawl
363d1f9207 Merge remote-tracking branch 'upstream/master' 2014-12-30 23:01:45 +01:00
mrcheko
04d95810d1 gamma/contrast system reworked 2014-12-30 18:33:11 +03:00
scrawl
9c693d078b Fix equipment update removing ammunition (Fixes #2144) 2014-12-30 16:22:06 +01:00
scrawl
1bd3ab8a2d Fix torch animation playing when torch is hidden (Fixes #2236) 2014-12-28 14:17:53 +01:00
scrawl
2e5e7370ba Adjust default angle, FOV and viewport of character preview (Fixes #2220) 2014-12-24 15:45:15 +01:00
scrawl
a47de06492 Make local map resolution configurable and use lower default value 
This seems to be the resolution the original engine is using. The change also significantly reduces cell loading time.
 2014-12-24 15:45:14 +01:00
scrawl
59f21c6105 Use "hair" as filter for PRT_Hair parts (Fixes #2218) 2014-12-24 15:45:14 +01:00
scrawl
d55fe43fc9 Support animation groups for Light and Door objects (Fixes #2039) 2014-12-24 15:45:14 +01:00
scrawl
42d63a4eb2 Fix position flicker after an animation ends 2014-12-24 15:45:14 +01:00
scrawl
8bc7eb5530 PlayGroup: Don't loop animations with no loop keys (Fixes #2223) 2014-12-24 15:45:13 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
Sebastian Wick
e85df00158 change setting "borderless" to "window border" 
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
 2014-12-24 15:09:50 +01:00
scrawl
c2771bc8ab Head tracking fix 2014-12-17 02:15:40 +01:00
scrawl
d962f0918d Implement NPC head tracking (Fixes #1720) 2014-12-16 20:47:45 +01:00
scrawl
d034a079e6 Allow equipping twohanded weapon and shield at the same time (Fixes #1785) 
The shield can be equipped, meaning armor rating and item enchantments apply, but can not be blocked with.
 2014-12-12 16:49:22 +01:00
scrawl
bc85bb32c2 Fix vampirism magic effect not applying immediately (Fixes #1984) 2014-12-12 02:39:59 +01:00
scrawl
2601b26217 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-12-11 22:44:58 +01:00
scrawl
a355550cab Add support for NPCs with missing head/hair models (Fixes #2078) 2014-12-11 21:43:31 +01:00
Marc Zinnschlag
19bd07648b Merge remote-tracking branch 'scrawl/pathgrid' 2014-12-11 20:32:32 +01:00
scrawl
3270f0e932 Change pathgrid workaround to check for interior cell name 2014-12-11 15:19:48 +01:00
scrawl
0fe7500f74 Work around pathgrid record limitation (Fixes #2195) 2014-12-09 00:13:56 +01:00
scrawl
f6960debcb Attach sound listener to the player head instead of camera 2014-12-08 23:26:09 +01:00
scrawl
e313ed3cef Support animated container models 2014-12-05 20:58:33 +01:00
scrawl
65536f0857 Load initial particle system state from NIF files (Fixes #2178) 2014-12-05 18:00:30 +01:00
scrawl
fee08f97ed Fix crash in character preview for non-existing meshes (Fixes #2128) 2014-12-03 18:28:35 +01:00
scrawl
75b0da5dce Don't updateBoneTree for non-skinned parts (Fixes #2124) 2014-12-03 18:28:35 +01:00
scrawl
fadbb5ad21 Add particle and sound fading for weather transitions (Fixes #2130) 2014-12-01 23:09:47 +01:00
scrawl
ed686ddd2f Don't update nodes with an empty name from the skeleton source (Fixes #2125) 2014-12-01 23:09:46 +01:00
scrawl
5f5fcc2fef Make PlayGroup use an indefinite number of loops (Fixes #2156) 2014-11-28 17:15:31 +01:00
scrawl
c1e6b8608b Always create a skeleton if there's an "ArrowBone" node (Fixes #2117) 2014-11-23 16:37:31 +01:00
scrawl
dbe30e31b9 Make creature's model take priority over base_anim.nif (Fixes #2055) 2014-10-25 00:56:43 +02:00
scrawl
eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies 
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
 2014-10-22 22:33:32 +02:00
scrawl
bcb2d714c0 Add TODO comments for future videoplayer enhancements 2014-10-21 23:46:04 +02:00
scrawl
5711103322 Remove leftover comment 2014-10-21 17:51:59 +02:00
scrawl
202cfa879f Implement frame drop support in the videoplayer (Fixes #1343) 2014-10-21 17:01:53 +02:00
scrawl
290aacd2a6 Fix videoplayer crash on quit 
The sound stream thread was trying to update the stream during/after destruction of the video state.
 2014-10-21 17:01:53 +02:00
scrawl
8472695f89 Revert "Fix for compiler warnings and deprecated functions usage in videoplayer." 
This reverts commit d77546b7dc.

Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
 2014-10-21 17:01:53 +02:00
scrawl
de0e0fedff Revert "Fix for compiler warnings and deprecated functions usage in videoplayer." 
This reverts commit f5589b42ea.

Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
 2014-10-21 17:01:53 +02:00
scrawl
681f3fa530 Revert "Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder." 
This reverts commit b40c1ff26c.
 2014-10-21 17:01:52 +02:00
scrawl
deabc52c16 Treat "Root Bone" as the animation root if existing (Fixes #2019) 2014-10-17 23:29:59 +02:00
scrawl
5892fd9e65 Fix NpcAnimation non-existing skeleton crash (Fixes #2028) 2014-10-17 23:07:01 +02:00
Marc Zinnschlag
eb45793eab Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage' 2014-10-13 11:03:03 +02:00
Thoronador
4d62541b62 fix usage of numeric_limits static functions min() and max() 
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
 2014-10-12 23:28:16 +02:00
MiroslavR
8456741eaa Fix blindness and create a separate fader for it 2014-10-12 19:06:40 +02:00
Marc Zinnschlag
aefe8cd4ae Merge remote-tracking branch 'lgro/issue1887_equipped_items_doesnt_emit_sound' 
Conflicts:
	apps/openmw/mwworld/class.cpp
 2014-10-12 14:06:08 +02:00
Lukasz Gromanowski
e1663de7cf Fixes #1887: Equipped items do not emit sounds 
Added getSound() method to MWClass class and implementation
into Light class.

Also added additional bool parameter responsible for enabling/disabling
of playing items sounds into NpcAnimation class constructor.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-12 11:40:14 +02:00
Lukasz Gromanowski
b44ba84a80 Issue #1887: Equipped items do not emit sounds 
Use separate arrays for sound ids and object parts.
Restored getting inventoryStore via getInventoryStore()
call (removed mInv introduced in previous commit).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-11 23:20:40 +02:00
Lukasz Gromanowski
1a0c3dc6cf Issue #1887: Equipped items do not emit sounds 
Removed unused mUnequipping and mFirstEquip member variables.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-11 22:33:11 +02:00
Lukasz Gromanowski
3b9cfba03c Issue #1887: Equipped items do not emit sounds 
Sounds are played only when actors draw state
is equal to MWMechanics::DrawState_Nothing

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-11 22:21:59 +02:00
MiroslavR
4dc613a04b Merge branch 'master' of github.com:OpenMW/openmw 2014-10-11 22:03:47 +02:00
Lukasz Gromanowski
fa65c8981a Issue #1887: Equipped items do not emit sounds 
Played sound items are based on parts not inserted items.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-11 21:05:12 +02:00
Thoronador
8361019456 fix uninitialized (pointer) vars in more classes 2014-10-11 02:31:26 +02:00
Thoronador
13a0c5624c fix uninitialized member variables in OcclusionQuery class 2014-10-11 01:35:12 +02:00
MiroslavR
29f5cb46ac Merge branch 'master' of github.com:OpenMW/openmw 2014-10-09 19:17:39 +02:00
sylar
70fd531722 None texturing filtering enable for android by default 2014-10-08 00:15:22 +04:00
sylar
f75721a217 Add none texture filtering .It is fixes a bug with black objects in shaders glsles 2014-10-07 23:30:31 +04:00
MiroslavR
d1dc9951d4 Do not display werewolf overlay in third person 2014-10-06 20:24:53 +02:00
scrawl
064f1964ba More efficient water walking 2014-10-05 22:27:20 +02:00
scrawl
5c3bc6563b Fix divisions by zero in normalizedEncumbrance 2014-10-05 15:50:01 +02:00
Lukasz Gromanowski
bcb38c3eba Issue #1887: Equipped items do not emit sounds 
Added handling of autoEquip and unequipAll cases.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-04 22:27:23 +02:00
scrawl
db6b04d127 Use the footstep volume slider for jump landing sounds (Fixes #1968) 2014-10-04 19:50:38 +02:00
Lukasz Gromanowski
e566e4abf2 Issue #1887: Equipped items do not emit sounds 
Added playing of sounds for equipped items (at this moment only for lights).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-04 16:47:29 +02:00
scrawl
58672c6bb5 Fix for crash in main menu when reflections are enabled 2014-10-02 18:12:49 +02:00
scrawl
7d36a202a8 Implement cell loading threshold (Fixes #1874) 
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.

Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
 2014-10-02 16:50:10 +02:00
scrawl
cc63f7f051 Fix broken idle camera 2014-10-02 14:23:13 +02:00
scrawl
85f5754bb6 Apply third person camera distance to the camera node instead of only the camera itself (Fixes #1705) 2014-10-02 00:26:57 +02:00
scrawl
46adf6344a Adjust third person camera height and default distance to match vanilla MW 2014-10-01 17:45:20 +02:00
scrawl
c010c28337 Implement ToggleWorld instruction 2014-09-30 15:54:09 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
4f0fc79ea4 Change global map cell size from 24 to 18 and make it configurable 2014-09-26 12:47:33 +02:00
scrawl
2066097202 Fix incorrect reading of global map state in some cases when the map size changed (Fixes #1946) 2014-09-25 15:28:02 +02:00
Marc Zinnschlag
3cd717cd47 Merge remote-tracking branch 'lgro/videoplayer' 2014-09-21 19:04:15 +02:00
Lukasz Gromanowski
b40c1ff26c Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder. 
Corrected ifdef from previous commit around codecCtx->refcounted_frames = 1;

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-09-21 16:23:05 +02:00
Lukasz Gromanowski
f5589b42ea Fix for compiler warnings and deprecated functions usage in videoplayer. 
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-09-21 16:09:16 +02:00
Lukasz Gromanowski
d77546b7dc Fix for compiler warnings and deprecated functions usage in videoplayer. 
Deprecated functions were:

- AVCodecContext::get_buffer
- AVCodecContext::release_buffer

Changed to:
AVCodecContext::get_buffer2 and setting AVCodecContext::refcounted_frames to 1
before call to avcodec_open2().

release_buffer usage was removed.

Also changed places when some fileds were compared to AV_NOPTS_VALUE
- it's signed, so removed unsigned int casting, or changed casting
to signed int.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-09-21 12:58:11 +02:00
scrawl
b1e74e2a85 Remove support for Ogre 1.8 versions 2014-09-21 10:41:13 +02:00
scrawl
e42cb8020e Change all skins to get font colors from fallback settings (Fixes #704) 2014-09-20 10:40:09 +02:00
scrawl
447e93bdb4 Use SpellCast animation for creatures that have it (flame atronach) 2014-09-18 03:24:47 +02:00
scrawl
3ce3f31452 Adjust turning animation speed multiplier based on turning speed 2014-09-17 07:02:19 +02:00
Marc Zinnschlag
3f671c86a8 Merge remote-tracking branch 'cc9cii/ffmpeg-swresample' 2014-09-15 12:44:38 +02:00
cc9cii
1107156334 Workaround incorrectly reported channel_layout 2014-09-12 21:18:54 +10:00
cc9cii
ce3077c970 Test version with debug statements. Also moved some common code out to a separate file. 2014-09-12 08:27:25 +10:00
cc9cii
48a36442c6 Add libswresample and libavresample support for sounds. 2014-09-11 21:15:18 +10:00
cc9cii
862c5fc8f6 Add libavresample support. Tested on windows x64 only. 2014-09-11 16:47:00 +10:00
scrawl
8b0cb239a9 Ignore text keys for zero-length animations (Fixes #1876) 
This fixes an issue where the Riekling's attack animation would trigger *two* hits on each swing. It has the "min hit" and "hit" keys at the same time, so the MinHitToHit segment a zero-length animation. This caused problems as the "hit" text key will be encountered twice; once when playing the "max attack to min hit" segment and once when playing the "min hit to hit" segment.
 2014-09-08 15:23:35 +02:00
cc9cii
785d2c7cc9 Remove incomplete implementation to support planar formats. Make libswresample a prerequisite. 2014-09-08 15:24:39 +10:00
cc9cii
f616000afb More fix based on code review. 2014-09-07 21:17:34 +10:00
cc9cii
c396149f23 Code review fix. 2014-09-07 20:35:32 +10:00
Rohit Nirmal
e315a72582 Remove extra semicolons at the end of some lines. 2014-09-06 13:04:52 -05:00
cc9cii
7ae8d04c47 Arrgh... silly typo 2014-09-04 19:07:19 +10:00
cc9cii
c6cad5adc5 Make cmake more reliably detect libswresample 2014-09-04 18:55:10 +10:00
cc9cii
801b9446b7 Support for ubuntu/debian. Can easily be reverted if not required. 2014-09-04 07:58:46 +10:00
cc9cii
093c7f8882 Moved format conversion to audio_decode_frame() 2014-09-03 22:52:03 +10:00
cc9cii
1e72cf4cdc More refactoring, remove more #ifdef guards and fix repeat samples for planar formats. 2014-09-03 18:13:43 +10:00
cc9cii
5095f729b0 Make travis happy again. 2014-09-02 22:05:54 +10:00
cc9cii
2d6b532ea5 Minimize the use of #ifdef guards for better code legibility. 2014-09-02 21:52:19 +10:00
scrawl
0eb949c8a7 Don't update ripples when they are not used 2014-09-02 04:29:37 +02:00
cc9cii
f4dd281393 Simplify the use of swr_convert and add #ifdef guards around code that require libswresample. 2014-09-01 21:49:37 +10:00
cc9cii
0b9d17a81d More cleanup. 2014-09-01 08:04:28 +10:00
cc9cii
fdee660ffb Implemented feedback review comments, removing hard coded values and adding error handling. 2014-09-01 08:02:25 +10:00
cc9cii
68cbb8989e Cleanup comments. 2014-08-31 23:39:17 +10:00
cc9cii
a7371eda4d Now works for both FLT and S16 formats. The output format is hard coded in the MovieAudioDecoder constructor (default S16). 2014-08-31 23:35:05 +10:00
cc9cii
8429dab271 Working version - converts FLTP to FLT. Does not work when converting to S16. 2014-08-31 22:01:08 +10:00
cc9cii
16c165185b Minor cleanup. Tested successfully on windows x64 using ffmpeg-20140823-git-7444cf9-win64-dev which is on libavcodec version 56.0.101. 2014-08-31 13:40:29 +10:00
cc9cii
944f99b23a Initial commit of FLTP format binkaudio support. Converts to FLT format by manually interleaving decoded samples. swresample library is included with a view to use swr_convert() in future versions, but not used in this commit. 2014-08-31 13:20:33 +10:00
Marc Zinnschlag
ce3d75bba2 Merge remote-tracking branch 'scrawl/master' 2014-08-28 12:34:08 +02:00
scrawl
0fe9612afb Implement basic spellcasting AI (Fixes #961) 
Select a weapon to attack with in AiCombat and equip it (Fixes #1609, Fixes #1772)
 2014-08-28 00:55:37 +02:00
scrawl
4f92044d71 Allow user-created markers on local map (Fixes #1571) 2014-08-26 17:45:23 +02:00
scrawl
e0e4cbbb41 Implement Light magic effect (Fixes #1122) 2014-08-24 02:37:59 +02:00
scrawl
714c927fda Fix being able to change camera during death via mouse wheel 2014-08-24 02:37:59 +02:00
scrawl
83037a1a91 Move fast-forward of particle systems outside of OgreNifLoader (Fixes #1830) 
Particle systems were being fast-forwarded before the skeleton base was attached, so particles without the LocalSpace flag would spawn at an incorrect position.
 2014-08-18 16:37:47 +02:00
scrawl
d8943aef2f Encapsulate magic effect magnitude (Feature #1489) 2014-08-17 03:58:04 +02:00
scrawl
7432771ac7 For non-active torches set the particle system speed factor to zero instead of destroying it (Fixes #1811) 2014-08-16 00:51:02 +02:00
scrawl
c62d53ae84 Remove no longer needed comments about coordinate system 2014-08-14 19:09:33 +02:00
scrawl
c065a4b203 Add ManualResourceLoader for global map overlay (Fixes #1736) 2014-08-14 19:01:03 +02:00