AnyOldName3
3785ba6aa0
Merge upstream/master
2018-10-30 22:38:09 +00:00
AnyOldName3
eb44de3e6b
Disable shadows properly for water reflection/refraction RTT targets, eliminating remaining OpenGL errors.
2018-10-30 22:34:53 +00:00
elsid
49d81241db
Merge branch 'master' into pathfinder_detour
2018-10-28 17:08:09 +03:00
Marc Zinnschlag
9dd0d641bc
Merged pull request #1931
2018-10-28 11:02:33 +01:00
Capostrophic
b6f23cd366
Make constants usage more obvious
2018-10-27 13:27:25 +03:00
Capostrophic
4873d33642
Adjust magic light source linear attenuation (bug #3890 )
2018-10-27 01:27:05 +03:00
Andrei Kortunov
e7de6b974a
Optimize actors processing
...
1. Do not update physics and animations for actors outside processing range (bug #4647 )
2. Do not render such actors
3. Add transparency to actors near processing border, so they will not pop up suddenly
2018-10-25 22:52:59 +04:00
AnyOldName3
1e2bf9c447
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-10-24 20:13:13 +01:00
Andrei Kortunov
46bf45a6e2
Remove redundant code
2018-10-19 16:16:18 +04:00
AnyOldName3
474770eca8
Switch shadow map rendering to a specialised, simplified shader.
2018-10-16 21:23:31 +01:00
elsid
ed73d130f9
Cache navmesh tiles
...
Use LRU modification to hold currently used items. Use RecastMesh binary
data for item key.
Store original pointer of btCollisionShape in user pointer to make available
it as an identifier within all duplicates. Use pointer to heights data array
for btHeightfieldTerrainShape.
2018-10-13 22:22:12 +03:00
elsid
ff478aba6d
Use actor half extent for interior cells
2018-10-13 22:16:33 +03:00
elsid
dc09674362
Add command and settings option to enable actors paths render
2018-10-13 22:16:32 +03:00
elsid
dbb1d99bff
Add NavMeshItem generation to fix update NavMesh for render
2018-10-13 22:16:30 +03:00
elsid
faaf50446d
Option to initially enable NavMesh render
2018-10-13 22:16:28 +03:00
elsid
70a369f70e
Add command to enable NavMesh render
...
togglenavmesh or tnm
2018-10-13 22:16:28 +03:00
AnyOldName3
0124be5713
Merge upstream/master
2018-10-10 21:23:19 +01:00
Capostrophic
47b1b0ac39
Re-fix water reflections while making a no-GUI screenshot
2018-10-10 22:44:26 +03:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Marc Zinnschlag
b410d87aae
Merged pull request #1952
2018-10-03 13:19:28 +02:00
Andrei Kortunov
3896a2eba6
Do not use a PartHolder for spell effect node
2018-10-01 20:18:20 +04:00
Andrei Kortunov
632045e145
Improve the 'part has no parents' warning
2018-10-01 20:18:19 +04:00
Andrei Kortunov
4dc424036f
Cleanup magic effects, when create a new ActorAnimation
2018-10-01 20:17:58 +04:00
Kyle Cooley
e2ac392a40
Move common stuff to scene util, fix errors with 1st person meshes
2018-09-27 13:14:59 +04:00
Kyle Cooley
8444ee9981
Start rendering npc's
2018-09-27 13:14:59 +04:00
Marc Zinnschlag
7be9f2ca45
Merged pull request #1891
2018-09-21 11:38:19 +02:00
Andrei Kortunov
bdd9eba2b8
Use C++ limits instead of C ones
2018-09-20 16:02:26 +04:00
Andrei Kortunov
70ed8fd1a9
Use constants instead of widely used magic numbers (task #4645 )
2018-09-17 19:22:50 +04:00
Andrei Kortunov
adbaeb7cca
Improve GUI scaling (bug #3288 )
2018-09-12 14:31:01 +04:00
Andrei Kortunov
e5a81b1f99
Fix some issues, found by Coverity Scan
2018-09-10 16:35:27 +04:00
Capostrophic
7ef6fa9f61
Remove deprecated GMST get* functions
2018-08-29 18:38:12 +03:00
Andrei Kortunov
60698e6f8a
Optimize new magic effects update system
2018-08-26 21:02:14 +04:00
Andrei Kortunov
3d4f5536d2
Check for impact immediately when launch a projectile (bug #3059 )
2018-08-24 15:03:54 +04:00
AnyOldName3
25e92481f4
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-08-21 14:00:58 +01:00
AnyOldName3
80082308f0
Merge upstream (shadermanager log system revamp)
2018-08-17 18:22:13 +01:00
Andrei Kortunov
31f8bea1dd
Rework spell effects management
2018-08-17 12:41:13 +04:00
Andrei Kortunov
8516aee6e0
Implement getHalfExtents() for non-actor objects
2018-08-17 12:40:01 +04:00
Andrei Kortunov
5a4d0cec3a
Use new logging system for game itself
2018-08-14 23:05:43 +04:00
AnyOldName3
1e48114492
Use JDGBOLT's indoor 'sun' direction.
2018-08-08 23:30:33 +01:00
AnyOldName3
a2b54714d4
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-08-08 23:28:06 +01:00
AnyOldName3
586ac2d12d
Revert "Prevent accidental culling of first person meshes"
...
This reverts commit c38bf6757a
.
2018-08-08 22:53:56 +01:00
Andrei Kortunov
b7859b3fa9
Cap underwater view distance (bug #4565 )
2018-08-08 13:22:40 +04:00
AnyOldName3
c38bf6757a
Prevent accidental culling of first person meshes
2018-08-02 15:50:43 +01:00
Andrei Kortunov
12144de8ed
Initialize missing variables
2018-08-01 20:18:37 +04:00
Andrei Kortunov
770d86f9bd
Initialize cubeSize variable for 360 degrees screenshots correctly
2018-08-01 19:36:55 +04:00
AnyOldName3
cc23a968d1
Merge upstream/master
2018-08-01 14:13:45 +01:00
Andrei Kortunov
3c7ab976c3
Ignore movement from scripted animations (bug #4475 )
2018-06-27 08:22:45 +04:00
Capostrophic
ecafcefae9
Fall back to regular head when getVampireHead fails
2018-06-24 14:39:48 +03:00
AnyOldName3
f8e4f3fca5
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-06-22 00:11:29 +01:00
Andrei Kortunov
c195144b17
Take transformation from first node with given name in file (bug #4469 )
2018-06-20 14:24:32 +04:00
AnyOldName3
553094669b
Merge upstream/master (& fix merge conflicts)
2018-06-20 00:11:23 +01:00
Marc Zinnschlag
a8ad530db9
Merged pull request #1749
2018-06-19 11:33:08 +02:00
Miloslav Číž
477e1437d2
Resolve conflicts
2018-06-14 15:30:28 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
2018-06-13 21:16:28 +02:00
Miloslav Číž
c3d7ee5a9e
Resolve merge conflicts
2018-06-13 08:22:37 +02:00
Miloslav Číž
db8aaa74d6
Start cell border debug drawing
2018-06-13 01:48:31 +02:00
Andrei Kortunov
f299be8158
Play scripted animations even if SkipAnim is used
2018-06-12 16:07:36 +04:00
Andrei Kortunov
fea34bd73f
Added support for per-group animation files
2018-06-08 17:04:15 +04:00
David Cernat
04a2025340
Fix crash when adding items to certain disabled creatures (bug #4441 )
2018-06-05 18:09:10 +03:00
scrawl
cfdf99f601
Revert "Merged pull request #1573 "
...
This reverts commit 7324bd368f
, reversing
changes made to 810e4416f6
.
2018-05-26 11:39:30 +00:00
Marc Zinnschlag
7324bd368f
Merged pull request #1573
2018-05-23 17:00:29 +02:00
AnyOldName3
9ff31cc80d
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-05-22 00:14:07 +01:00
AnyOldName3
9093ab59f6
Restore water object refractions and reflections.
2018-05-21 23:57:38 +01:00
Andrei Kortunov
df459199dd
Avoid left shift of negative value
2018-05-16 12:59:05 +04:00
AnyOldName3
44b2cf2b7f
Merge upstream.
2018-05-11 19:15:04 +01:00
Andrei Kortunov
22fb1f3403
Play spellcasting effects from objects
2018-04-30 17:12:06 +04:00
scrawl
b995584ad2
Merge pull request #1688
2018-04-29 14:27:55 +00:00
Capostrophic
6b47f72959
Set character preview scene ambient to 0, 0, 0
2018-04-25 15:31:49 +03:00
scrawl
bdf1070852
Merge pull request #1688
2018-04-25 11:54:26 +00:00
Capostrophic
bfcdf660f2
Utilize inventory character preview lighting rotation fallback settings
2018-04-23 22:48:15 +03:00
Capostrophic
b69e812a52
Utilize inventory character preview lighting color fallback settings
2018-04-22 22:37:27 +03:00
scrawl
0982d2175a
Merge pull request #1473
2018-04-09 20:23:43 +00:00
bret curtis
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
2018-03-27 20:20:40 +02:00
Chris Robinson
01dbac7b15
Don't use a different setting for distant viewing distance
2018-03-04 11:37:57 -08:00
Chris Robinson
41669467ae
Make settings for distant fog parameters
2018-03-04 11:37:57 -08:00
Chris Robinson
154cc8c659
Use alternate fog parameters when distant land is enabled
...
This allows the distant land to actually be seen when the user enables it. The
values used are replicated from MGE XE's default settings and should probably
be exposed somewhere.
2018-03-04 11:37:57 -08:00
Chris Robinson
6d557fec8e
Increase the far clip plane when distant terrain is enabled
2018-03-04 11:37:57 -08:00
AnyOldName3
6d29375d5e
Turning on shadows will now force shaders on
2018-03-03 15:50:36 +00:00
AnyOldName3
e46bf28e5f
Add object shadows setting
2018-03-03 15:13:36 +00:00
AnyOldName3
d4b37ad6b1
Apply Scrawl's fix for the local map
2018-03-03 15:06:05 +00:00
AnyOldName3
d6a7aec971
Make RenderingManager::configureAmbient do what it was intended to.
2018-03-03 01:54:21 +00:00
scrawl
839196e4fa
Force normal polygon mode for the map camera ( Fixes #4235 )
2018-03-03 00:15:57 +00:00
AnyOldName3
cfad38b869
Make masks consecutive and ordered.
2018-03-01 17:32:45 +00:00
AnyOldName3
6f582f5411
Make indoor shadows do something meaningful.
2018-03-01 17:30:53 +00:00
AnyOldName3
3fe8dc6309
Remove leftover import
2018-02-27 16:05:11 +00:00
AnyOldName3
d1a2955fa1
Merge upstream
2018-02-27 14:29:14 +00:00
AnyOldName3
f9cf1ac94b
Separate indoor and outdoor shadow casting masks.
2018-02-27 00:13:51 +00:00
AnyOldName3
e233dae1cd
Hook up the new shadow technique
2018-02-26 22:27:09 +00:00
AnyOldName3
02d0ee3485
Rename old shadow class to shadow manager
2018-02-26 14:29:31 +00:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360
2018-02-25 11:25:19 +01:00
scrawl
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
2018-02-13 00:40:41 +00:00
scrawl
899d464b0d
Cap the rain emitter's frame time ( Fixes #4314 )
2018-02-10 23:14:41 +00:00
AnyOldName3
c3d7c7de21
Prevent first-person meshes disappearing.
2018-01-23 20:13:37 +00:00
AnyOldName3
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-01-22 15:54:13 +00:00
scrawl
dd5ebe225b
Merge pull request #1580
2018-01-11 01:54:28 +00:00
scrawl
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
2018-01-11 01:49:35 +00:00
Miloslav Číž
3b741dc4b7
Revert "Add slider for refraction size in settings window"
...
This reverts commit ee40b41285
.
2018-01-01 13:28:14 +01:00
AnyOldName3
8d4b32166c
Remove outdated comments
2017-12-27 02:35:25 +00:00
AnyOldName3
c3e0398d1c
Add settings
2017-12-27 02:32:17 +00:00
AnyOldName3
f56a117bde
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-12-26 23:52:25 +00:00
AnyOldName3
4de3a361fb
Make shadow maps only cover regions where shadow receivers might be.
2017-12-26 23:18:50 +00:00
scrawl
b8c25e6bff
Use the correct priority of animation sources in getStartTime ( Fixes #4263 )
2017-12-21 14:49:09 +00:00
AnyOldName3
b08938485f
Make suspending viewer threads the responsibility of the caller, not the shader manager.
2017-12-17 23:55:19 +00:00
AnyOldName3
229cc9696f
Make updating global shader defines update shaders.
2017-12-17 01:57:53 +00:00
AnyOldName3
617473c7da
Force near plane out further for LiSpSM projection
2017-12-12 18:06:20 +00:00
Miloslav Číž
ee40b41285
Add slider for refraction size in settings window
2017-12-09 14:03:56 +01:00
Miloslav Číž
b69c16e682
Add setting option to scale water refractions
2017-12-06 20:39:09 +01:00
Miloslav Číž
37aa761283
Change spherical screenshot filtering to nearest
2017-12-01 21:47:26 +01:00
AnyOldName3
4612597877
Switch to insert_or_assign semantics when adding shadow defines to the global shader defines.
2017-11-22 20:54:39 +00:00
AnyOldName3
98cd9fc144
Add preliminary support for global shader defines.
2017-11-22 20:07:07 +00:00
AnyOldName3
0f6f097cf2
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-11-17 18:24:08 +00:00
Miloslav Číž
df61a30259
preincrement
2017-11-16 23:20:24 +01:00
Miloslav Číž
ddbf6c162f
use linear filtering for the cubemap
2017-11-16 22:43:41 +01:00
Miloslav Číž
fc507c66f7
remove no longer needed stuff
2017-11-16 22:17:00 +01:00
Miloslav Číž
3ae5310567
use loading screen to freeze the screen
2017-11-16 22:08:33 +01:00
Miloslav Číž
2b5f147545
allow non-power-of-2 sized cubemaps
2017-11-16 20:06:34 +01:00
Miloslav Číž
bccff768ff
select closest power of 2 resolution for the cubemap
2017-11-16 13:41:09 +01:00
Miloslav Číž
56c74fb96f
add scene switch node
2017-11-16 12:46:46 +01:00
Miloslav Číž
1a4f351e3d
move camera freeze code
2017-11-16 12:17:52 +01:00
Miloslav Číž
af38d3a47d
get rid of sphericalscreenshot class
2017-11-15 17:01:16 +01:00
Miloslav Číž
226fb9c26b
render cubemaps in OGL coordinates
2017-11-15 16:07:01 +01:00
Miloslav Číž
1c3d45f641
dirty 360 screenshot GPU setup
2017-11-15 15:20:59 +01:00
Miloslav Číž
823218bb61
freeze screen during screenshot taking
2017-11-14 18:23:12 +01:00
Miloslav Číž
511a5686da
planet mapping adjustment
2017-11-11 15:10:54 +01:00
Miloslav Číž
4fc532d873
reference screenshot settings only from one place
2017-11-11 14:32:28 +01:00
Miloslav Číž
d71d984cfa
more unused stuff cleanup
2017-11-11 14:14:24 +01:00
Miloslav Číž
525f8b4d8e
get rid of special key for 360 screenshot
2017-11-11 13:51:42 +01:00
scrawl
b06512a60d
Fix error message that referred to the wrong file (Bug #4159 )
2017-11-10 22:51:32 +00:00
Miloslav Číž
1f49612ca3
enable water effects for 360 screenshots
2017-11-10 19:18:16 +01:00
Miloslav Číž
319ed2f9b8
disable 360 screenshots in vanity/preview mode
2017-11-10 15:23:44 +01:00
Miloslav Číž
497b33e403
small corrections
2017-11-10 14:28:09 +01:00
Miloslav Číž
9ab3a0c44b
set cubemap width differently
2017-11-10 11:16:25 +01:00
Miloslav Číž
5baff05bac
add cubemap mapping
2017-11-10 10:50:28 +01:00
Miloslav Číž
5a07d135ae
add settings for cubemap size
2017-11-10 10:34:46 +01:00
Miloslav Číž
1b184d8716
correct player mask
2017-11-09 23:09:13 +01:00
Miloslav Číž
e54c0a90fa
fix mirrored spherical screenshots
2017-11-09 21:14:02 +01:00
Miloslav Číž
d763e9fe46
add settings for spherical screenshots
2017-11-09 20:25:29 +01:00
Miloslav Číž
8f32114025
segfault fix
2017-11-09 18:26:27 +01:00
Miloslav Číž
d4fd08a63f
save 360 screenshots in the configured directory
2017-11-09 16:49:46 +01:00
Miloslav Číž
f60840754f
disable water effects for spherical screenshots
2017-11-09 14:44:42 +01:00
AnyOldName3
548c42b5fd
Disable over-zealous shadows in the character preview.
2017-11-08 13:38:30 +00:00
AnyOldName3
64d5d0fd66
Prevent the local map from being considered to be shadowed.
2017-11-08 13:30:13 +00:00
Miloslav Číž
5698d70806
small planet mapping
2017-11-08 12:58:27 +01:00
Miloslav Číž
5f36518181
spherical mapping
2017-11-08 09:15:45 +01:00
AnyOldName3
e201e359a9
Move Shadow to Components
2017-11-08 01:44:49 +00:00
AnyOldName3
1a30a917af
Merge upstream/master
2017-11-08 01:31:38 +00:00
AnyOldName3
2e7951c83f
Remove unused mask
2017-11-08 01:28:10 +00:00
AnyOldName3
aa31cbba4f
Attempt (and fail) to make the local map show without unwanted shadow
2017-11-08 01:20:52 +00:00
AnyOldName3
c3616ca78b
Merge branch 'osgshadow-test-vdsm-sky-method-two' into osgshadow-test-vdsm
2017-11-08 00:35:54 +00:00
scrawl
95b3c1181a
Update shader with a non-color tracking material when equipment is changed during chameleon/invisibility effects ( Fixes #4190 )
2017-11-08 00:24:52 +00:00
Miloslav Číž
4761a3d98b
dirty cylindrical projection
2017-11-07 22:13:05 +01:00
AnyOldName3
3403205231
Use three shadow maps per light
2017-11-07 20:34:48 +00:00
Miloslav Číž
3be9e2ee95
make spherical screenshot class
2017-11-07 19:47:36 +01:00
AnyOldName3
3106159721
Turn off all shadow texture units for the sky now it is possible for there to be more than one
2017-11-07 16:40:32 +00:00
AnyOldName3
09b02c307a
Merge from base branch
2017-11-07 16:34:51 +00:00
Miloslav Číž
5afe02505b
hide player in first person 360 screenshot
2017-11-07 16:12:31 +01:00
Miloslav Číž
ce55d7c2f5
basic cubemap rendering
2017-11-07 15:02:01 +01:00
Miloslav Číž
7feba7e498
basic setup for 360 screenshots
2017-11-07 13:07:11 +01:00
AnyOldName3
56fa33af66
Enable parallel split shadow maps
2017-11-07 00:32:04 +00:00
AnyOldName3
7a03ad6558
Switch to a tidier way of disabling the correct texture unit
2017-11-05 14:46:03 +00:00
AnyOldName3
26fe47b9a2
Merge branch 'osgshadow-test-vdsm' into osgshadow-test-vdsm-sky-method-two
2017-11-05 14:39:41 +00:00
AnyOldName3
3f63ebce77
Theoretically, at least, fix everything (except hte sky issue which is resolved in another branch)
2017-11-05 14:37:36 +00:00
AnyOldName3
d0587a3ad5
Clean up the debug hud now it's working.
2017-11-03 14:33:06 +00:00
AnyOldName3
b0c0c88201
Merge branch 'osgshadow-test-vdsm' into osgshadow-test-vdsm-sky-method-two
2017-11-03 00:44:47 +00:00
AnyOldName3
ce0e937e8d
Attempt to force the sky to not accept the default shadow shader or shadow texture.
2017-11-01 18:22:59 +00:00
scrawl
ceaf0ee409
Enable shadow casting for terrain
...
Add a check to TerrainDrawable to make sure shadows are only drawn once, not once per blending pass
2017-10-31 21:21:05 +01:00
scrawl
8141ee47d5
Fix shader compile error
2017-10-31 20:22:14 +01:00
scrawl
d0866d1b3c
Revert change to node mask that appears to not serve any purpose
2017-10-31 20:21:54 +01:00
AnyOldName3
ab669a434e
Update the shadow frustrum bounds properly
2017-10-30 19:54:54 +00:00
AnyOldName3
ef8a7d1cb9
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-10-26 23:40:05 +01:00
AnyOldName3
cf54b4a130
Prevent debug HUD geometry from being culled erroneously.
2017-10-26 20:38:36 +01:00
Miloslav Číž
3731e20228
fix rain ripple regression
2017-10-24 14:12:41 +02:00
AnyOldName3
2a90dff388
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-10-19 15:06:49 +01:00
Miloslav Číž
a7cad65aab
fix water shader switching bug
2017-10-17 10:00:01 +02:00
Miloslav Číž
8a1e0e74fd
update uniform from one place
2017-10-17 09:59:53 +02:00
Miloslav Číž
797e407269
make snow create water ripples
2017-10-17 09:59:53 +02:00
Miloslav Číž
da47653625
move rain intensity uniform to water node
2017-10-17 09:59:45 +02:00
Miloslav Číž
af6eeddbe5
use operator instead of drawcallback
2017-10-15 00:04:14 +02:00
Miloslav Číž
65977b910e
wrap weather around in all directions
2017-10-14 21:42:27 +02:00
Miloslav Číž
380a5799dd
use bbox as wrap range & apply to all particle systems
2017-10-14 21:42:19 +02:00
Miloslav Číž
38bfa64100
transform weather particles to world space
2017-10-14 21:42:11 +02:00
Miloslav Číž
8114126a62
make use of renderinfo
2017-10-14 21:41:59 +02:00
Miloslav Číž
33a1459b11
search for particle system by class name
2017-10-14 21:41:47 +02:00
Miloslav Číž
b95c9ba483
rain independent from camera plus wrap-around
2017-10-14 21:40:28 +02:00
AnyOldName3
737563875a
Remove superfluous - sign and switch to other debug shader
2017-10-14 01:13:45 +01:00
AnyOldName3
be50ed7387
Use a test image guaranteed to exist.
2017-10-13 18:27:32 +01:00
AnyOldName3
26a7b48d69
Attempt to make a VDSM work, and also to set up a debug HUD, but without success.
2017-10-13 18:19:29 +01:00
AnyOldName3
0568c93b39
Add specific shadow source files to MWRender
2017-10-03 03:40:23 +01:00
AnyOldName3
ba1e2cab2f
Merge remote-tracking branch 'upstream/master' into osgshadow-test
2017-10-03 03:00:15 +01:00
Miloslav Číž
4999c667b6
fix rain ripple bug
2017-09-29 19:56:16 +02:00
Miloslav Číž
8416feaf5b
link rain water ripple effect to actual rain
2017-09-28 19:04:31 +02:00
Miloslav Číž
cde2c13900
make water depth independent of view frustum
2017-09-26 14:14:28 +02:00
Miloslav Číž
8df79625e8
fix water shader
2017-09-22 10:53:02 +02:00
Miloslav Číž
16d9773c6c
fix water shader artifacts at shores
2017-09-21 22:25:36 +02:00
Miloslav Číž
566fa6c118
Merge branch 'master' of git://github.com/OpenMW/openmw
2017-09-20 16:39:31 +02:00
Miloslav Číž
2346c5338e
increase water fudge to get rid of artifacts
2017-09-20 16:34:27 +02:00
AnyOldName3
99f6a1b8e1
Switch to LispSM
2017-09-19 23:44:37 +01:00
Chris Robinson
917a3b5dff
Avoid creating temp strings when looking for an animation stop key
2017-09-18 01:41:05 -07:00
Chris Robinson
b770c1493f
Don't spam about missing animations
2017-09-18 01:28:40 -07:00
scrawl
00034192dc
Fix player Ptr in RenderingManager not being updated on cell changes
...
Noticed that 'setpos' wasn't working in the console with the player selected.
2017-09-17 23:07:17 +00:00
Chris Robinson
780e82480d
Make the PlayMode and PlayType enums scoped
...
Also shorten them by putting them in the MWSound namespace
2017-09-15 02:36:59 -07:00
AnyOldName3
a5397e5f2d
Merge master
2017-09-11 22:26:46 +01:00
scrawl
7688696765
Merge pull request #1437 from Capostrophic/nodemapfix
...
Use constant nodeMap during part updating in creature animation
2017-09-10 18:15:20 +00:00
Capostrophic
9503d61866
Use const nodeMap in creature animation
2017-09-09 23:22:16 +03:00
scrawl
4c5992a0d5
Warn if removing a node fails
2017-09-01 21:42:35 +00:00
scrawl
132ac6001b
Fix bug of Animation::mSkeleton not being assigned
...
This bug resulted in deactivating a Skeleton not working properly for creatures (that are out of processing range), therefore reduced performance.
2017-09-01 21:42:34 +00:00
Andrei Kortunov
7f5f5458d4
Reset player attack animation when unequip weapon or tool
2017-09-01 18:03:23 +04:00
AnyOldName3
e2623d21ab
Merge remote-tracking branch 'upstream/master' into osgshadow-test
2017-08-23 13:33:22 +01:00
MiroslavR
d24286273b
Prevent respawned references from being added to the scene twice in certain cases ( Fixes #3864 )
2017-08-01 00:11:14 +02:00
scrawl
9bc24ab629
Fix character preview zNear/zFar not being autocomputed as intended (Bug #3955 )
2017-07-22 00:38:27 +02:00
scrawl
5c11266a46
Fix character preview item selection
2017-07-22 00:06:43 +02:00
scrawl
7f634514a8
Fix the viewport of the character preview being set a frame ahead due to a threading issue
2017-07-19 17:43:15 +02:00
scrawl
ac78d01b2b
Terrain: use the main camera's viewpoint for intersection tests
...
Fixes lag spikes caused by intersection tests loading/unloading terrain pages.
2017-07-19 13:11:44 +02:00
Bret Curtis
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c
purge the rest of boost::shared and any other boost related things that no longer are required
...
put boost system back in, clean others up
revert Qt
add back boost fstream
2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104
replace boost::shared_ptr in extern and components
2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
2017-06-09 16:49:25 +02:00
scrawl
0e37e71ea2
Merge pull request #1266 from akortunov/handsfallbackfix
...
Improved hands bodyparts selection fallback
2017-04-23 00:36:48 +02:00
Andrei Kortunov
4544caf7f3
Improved bodypart select fallback ( fixes #2594 )
2017-04-22 22:23:10 +04:00
Allofich
ff3e307059
Pass parameters by const reference
2017-04-20 23:47:03 +09:00
Allofich
5a00b239ac
Reduce scope of variables
2017-04-20 01:22:30 +09:00
scrawl
532b26bf3c
osgShadow experiment
2017-04-14 15:35:41 +02:00
scrawl
3c9f3a0f7f
Merge pull request #1242 from Allofich/warnings
...
Fix AppVeyor warnings
2017-03-29 07:28:00 +02:00
Allofich
db2f97f308
Fix shadowing warning
2017-03-27 20:22:20 +09:00
scrawl
b064dd29cc
Fix reset of blend function (Bug #3811 )
2017-03-27 02:51:23 +02:00
scrawl
9371100fde
Reuse the intersection visitor and set a traversal number to allow the terrain component to manage its view more efficiently
2017-03-14 19:27:56 +01:00
scrawl
d055dc25bf
Add custom traversal for local map camera to avoid loading terrain nodes that are exactly outside the border to another cell
2017-03-14 19:27:56 +01:00
scrawl
28fd492711
Don't use terrain LOD for the map camera
2017-03-14 19:27:56 +01:00
scrawl
e7a0878c10
Add CompositeMapRenderer info to the stats panel
2017-03-14 19:27:56 +01:00
scrawl
ec0b743123
Revert "Change ordering of LocalMap nodes to make sure they are traversed before the CompositeMapRenderer."
...
This reverts commit 7d72c70c93ee3c0cc3d00d37b22c339d0103cd19.
2017-03-14 19:27:56 +01:00
scrawl
1c15686353
Remove non required use of WorkQueue
2017-03-14 19:27:56 +01:00
scrawl
19d516cbda
Use the QuadTreeWorld based on distant terrain setting now that it sort of works.
2017-03-14 19:27:56 +01:00
scrawl
4dbd224249
Hide the terrain in non-exterior cells
2017-03-14 19:27:56 +01:00
scrawl
c684860e3b
Change ordering of LocalMap nodes to make sure they are traversed before the CompositeMapRenderer.
2017-03-14 19:27:55 +01:00
scrawl
2d549d088e
Get the world size from the ESM::Land store
2017-03-14 19:27:55 +01:00
scrawl
14225a42c6
Remove unused pointer to IncrementalCompileOperation
2017-03-14 19:27:55 +01:00
scrawl
5eff286c71
Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps.
2017-03-14 19:27:55 +01:00
scrawl
e323b2fa7b
Use the SceneManager's ShaderManager
2017-03-14 19:27:55 +01:00
scrawl
051c17a184
Make reportStats const
2017-03-14 19:27:55 +01:00
scrawl
2c68ed4fb4
Remove no longer required use of UnrefQueue as the new resource manager will naturally clear the cache from the worker thread
2017-03-14 19:27:55 +01:00
scrawl
35d53acc65
Factor out terrain chunk loading/caching into a new resource manager
2017-03-14 19:27:55 +01:00
scrawl
9a3a64f0c4
Add resource manager for ESM::Land to allow data to be unloaded when no longer required
2017-03-14 19:27:55 +01:00
scrawl
5f76317807
Wait for completion of CreateMapItem on exit to avoid potential threading issue
2017-03-14 19:27:55 +01:00
scrawl
ccfebdd2c3
Set the underwater fog relative to default view distance
2017-03-14 19:27:44 +01:00
scrawl
fe439e7bbf
Add missing default material state for character preview
2017-03-14 05:02:31 +01:00
scrawl
37c71c15f2
Remove redundant state
2017-03-14 04:57:36 +01:00
scrawl
4c9bbce1e2
Fix node mask being reset
2017-03-14 01:01:50 +01:00
scrawl
42a04de37c
Fix a crash that occurred when a carried light fails to be attached.
2017-03-04 21:48:31 +01:00
scrawl
29556a1802
More consistent wording of errors/warnings
...
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.
An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.
The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.
Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
2017-03-04 21:48:31 +01:00
scrawl
1692b7f38e
Merge pull request #1209 from dhustkoder/master
...
Added ConstContainerStoreIterator (Task #3092 )
2017-03-02 18:36:21 +01:00
scrawl
2873c10284
Clean the object root of StateSets and hidden nodes
2017-03-01 03:09:32 +01:00
scrawl
4e0011bfc8
Improve NPC loading performance by caching the cleaned objectRoot
2017-03-01 03:00:49 +01:00
Rafael Moura
6c2ce2b2a1
Porting more ContainerStoreIterator usage to const version #4
...
removed const_cast revision
2017-02-28 19:11:00 +00:00
Rafael Moura
7fa2703715
Porting more ContainerStoreIterator usage to const version #3
2017-02-28 14:31:51 +00:00
scrawl
75677f03e7
Remove SceneManager::notifyAttached
2017-02-24 02:58:41 +01:00
scrawl
afa39d121f
Fix 'part has no parent' warning caused by destructing in the wrong order
2017-02-24 02:58:41 +01:00
scrawl
d163228199
Fix updatePtr
2017-02-22 21:02:34 +01:00
scrawl
00d4fea91c
Derive Animation from osg::Referenced to allow the UnrefQueue to delete it
2017-02-22 15:27:20 +01:00
scrawl
a5247394dc
(Re)set the inventory listener outside of the Animation class
2017-02-22 15:08:22 +01:00
scrawl
8f79fa3d72
Add resource statistics panel opened with F4
2017-02-22 14:28:45 +01:00
scrawl
0fbd29ccb8
Use additive alpha blending on the character preview
2017-02-21 18:29:18 +01:00
scrawl
e38221edc9
Set character preview's simulationTime to 0 to avoid flickering lights
2017-02-21 18:25:25 +01:00
Rafael Moura
9963601484
Porting code to ConstContainerStoreIterator #1
2017-02-19 15:18:35 +00:00
Allofich
621d3e56cf
Fix Clang and OS X Travis CI warnings
2017-02-17 02:08:39 +09:00
scrawl
f10edb71cc
Add environment variable for disabling IncrementalCompileOperation
2017-02-15 21:01:25 +01:00
scrawl
72c6b11cf8
Move global map render to the worker thread
2017-02-14 07:58:16 +01:00
scrawl
026a05718f
Construct the WorkQueue in Engine
2017-02-14 07:58:16 +01:00
scrawl
ddd6605608
Move WNAM out of LandData to avoid redundant (de)allocations on startup
2017-02-14 07:58:16 +01:00
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