1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 07:49:56 +00:00
Commit graph

228 commits

Author SHA1 Message Date
scrawl
07d0f4458d Rotate clouds/particles to come from red mountain (Fixes #245) 2014-06-27 03:22:00 +02:00
scrawl
e5254ff8ef Set render queue for rain 2014-06-26 14:26:53 +02:00
scrawl
7b1e1d03d8 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwrender/sky.hpp
2014-06-26 04:29:03 +02:00
scrawl
f6a568c995 Implement rain (Feature #41) 2014-06-25 18:20:21 +02:00
Marc Zinnschlag
85965bfd47 Merge remote-tracking branch 'scrawl/master' 2014-06-25 09:58:00 +02:00
scrawl
693a097b21 Implement idlestorm animation (Feature #41) 2014-06-24 18:37:38 +02:00
scrawl
36132e054a Implement ashstorm, blightstorm, snow and blizzard effects (Feature #41) 2014-06-24 15:00:15 +02:00
Fil Krynicki
cfea7736d9 WIP fix
Bug is fixed, but appears to have broken vision underwater. Notes:

+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
2014-06-16 17:08:02 -04:00
scrawl
edb5a54092 Include some more required Ogre headers explicitely. 2014-03-05 21:46:37 +01:00
scrawl
1624e0fd8a Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine. 2013-12-07 20:15:39 +01:00
scrawl
c7805e7dd2 Fix sun glare persisting after changing to an interior cell 2013-05-18 23:10:37 +02:00
Glorf
39c7bc8363 Corrected celestical object sizes 2013-05-14 20:34:40 +02:00
scrawl
301efb411e Fix exit crash 2013-05-07 19:15:28 +02:00
scrawl
8845c0cee1 Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera. 2013-05-07 17:38:24 +02:00
Chris Robinson
d17e1e83d5 Rename MWRender's Player to Camera 2013-04-29 05:50:40 -07:00
Chris Robinson
2db72ae607 Rename EntityList to ObjectList 2013-04-07 01:52:35 -07:00
Marc Zinnschlag
08f6d04960 constness fixes 2013-03-18 08:29:40 +01:00
Glorf
6165cd2c6b Moons fallbacks partially implemented 2013-03-17 14:22:30 +01:00
scrawl
05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 15:14:20 +01:00
Nathan Jeffords
109dff2d29 renamed high level NIF files... 2013-03-02 13:23:09 -08:00
scrawl
d4264353a3 Merge branch 'z-up' into graphics
Conflicts:
	apps/openmw/mwrender/localmap.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/water.cpp
	files/materials/water.shader
2013-02-26 14:54:53 +01:00
scrawl
cc9b72b9b1 Removing some leftovers of mwRoot node 2013-02-26 14:01:10 +01:00
scrawl
2e7bc1a368 Z-up conversion: local map, fix tcg 2013-02-26 13:39:10 +01:00
scrawl
3ef952172d Z-up conversion: water, sky 2013-02-26 10:38:48 +01:00
scrawl
8aff033a0c Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog 2013-02-25 18:29:11 +01:00
scrawl
cacdb33b42 Merge branch 'master' into graphics
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
2013-02-25 15:12:03 +01:00
scrawl
791d16bbdb Use infinite AAB for sky meshes to fix them from disappearing from underwater refraction, while still taking advantage of CPU culling for other meshes 2013-02-17 18:12:38 +01:00
scrawl
7ffcfa3622 Water and clouds no longer depend on timescale. 2013-02-17 16:23:55 +01:00
Chris Robinson
bd4fdf47a3 Merge remote-tracking branch 'zini/master' into animation2
Conflicts:
	apps/openmw/mwrender/sky.cpp
2013-02-05 02:27:57 -08:00
scrawl
0f37c24d5f Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-02-04 21:55:41 +01:00
scrawl
bf037b7d29 Removed problematic ModVertexAlpha method, now done in shader 2013-02-04 18:03:03 +01:00
scrawl
15e51b76de Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth 2013-02-03 15:46:23 +01:00
Chris Robinson
e8ac3976b5 Fix some subentity assumptions 2013-01-10 06:35:06 -08:00
Chris Robinson
c4c8295e0b Rename NIFLoader to Loader, and update some comments 2013-01-09 09:10:59 -08:00
Chris Robinson
99769879e3 Fix some createEntities calls 2013-01-06 00:32:38 -08:00
scrawl
2f0b47fc38 test 2012-09-13 00:21:58 +02:00
scrawl
b97b3d7b71 fix sky position when reflection is enabled, fix delay in sky reflection 2012-08-17 15:19:44 +04:00
greye
575244bd35 fix SkaManager issue 2012-08-17 15:19:44 +04:00
Chris Robinson
36be1536d9 Return text keys from NIFs when creating entities 2012-07-23 17:20:47 -07:00
Chris Robinson
44975854e5 Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
	apps/openmw/mwrender/sky.cpp
2012-07-23 13:46:05 -07:00
Chris Robinson
f67983bbee Don't assume one sub-entity for the night sky entities 2012-07-23 13:37:05 -07:00
scrawl
a70f93b024 fix "Crash when running openmw with --start="XYZ", remove HLSL for windows 2012-07-23 20:12:42 +02:00
scrawl
ab35bfa32c fixed a sky issue 2012-07-23 18:19:34 +02:00
scrawl
f8d6a36196 Merge branch 'master' into nif-cleanup
Conflicts:
	apps/openmw/mwrender/sky.cpp
	apps/openmw/mwrender/sky.hpp
	components/nifogre/ogre_nif_loader.cpp
	components/nifogre/ogre_nif_loader.hpp
2012-07-23 15:35:31 +02:00
scrawl
acc5c3bbbf some fixes 2012-07-20 17:08:15 +02:00
scrawl
e077814a8c water 2012-07-19 22:23:07 +02:00
Chris Robinson
92546ca18d Move the last bits of code to createEntities 2012-07-17 20:23:09 -07:00
Chris Robinson
939d0d2fc5 Return a list of meshes and the skeleton from NIFLoader::load 2012-07-13 20:01:15 -07:00
scrawl
7731e9a6fa finished cleaning up sky 2012-07-13 09:13:12 +02:00
scrawl
ad7383be43 sky 2012-07-11 09:08:55 +02:00
scrawl
865bfc6f47 sync mrt_output setting 2012-07-11 02:31:03 +02:00
scrawl
07fd9986ef accidently removed the map. 2012-07-09 20:14:07 +02:00
scrawl
a095572205 fixed some textures, started with sky 2012-07-06 10:31:48 +02:00
scrawl
4ea6530772 hello world. 2012-07-04 00:26:57 +02:00
Marc Zinnschlag
c85aaafac2 more include cleanup (most removing Ogre.h) 2012-07-03 15:32:38 +02:00
Marc Zinnschlag
4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 2012-07-03 12:30:50 +02:00
scrawl
f6a6684685 when the resolution changes, adjust camera aspect ratio and recreate compositors 2012-05-27 21:39:18 +02:00
scrawl
02dad448fe make the wireframe mode not affect sky 2012-05-03 05:38:43 +02:00
Marc Zinnschlag
35f478071e Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
scrawl
2a4fcf42a3 basic shadows 2012-04-11 18:53:13 +02:00
scrawl
c49d5dd40b another sky tweak 2012-04-06 19:23:19 +02:00
scrawl
8316a4c2ec add mrt dummy output to sky shaders 2012-04-06 17:21:56 +02:00
scrawl
ec3fe1ef00 no sun glare in the reflection 2012-04-06 15:17:54 +02:00
scrawl
393530e671 more or less fixed the sky for normal viewing angles, still disappears at a certain height though 2012-04-06 15:05:17 +02:00
scrawl
1b89a9e203 various fixes 2012-04-05 15:30:55 +02:00
scrawl
e1bde415f5 typo 2012-04-05 14:22:44 +02:00
scrawl
43fd0352f4 removed unneeded lines 2012-04-05 14:21:57 +02:00
scrawl
5664d879a5 fixed some sky objects 2012-04-05 11:40:56 +02:00
scrawl
6442d49e16 render queue groups, sky fix 2012-04-04 18:53:40 +02:00
scrawl
8aea311797 added visibility flags for everything 2012-04-03 15:13:47 +02:00
scrawl
d4a2bdfa3d fix crash when hardware occlusion queries unsupporetd 2012-04-02 20:46:42 +02:00
scrawl
9a261a02aa changed the cloud movement direction like suggested on the forum 2012-04-01 15:14:43 +02:00
scrawl
ee754eda6c don't create sky until entering an exterior cell 2012-04-01 15:07:41 +02:00
scrawl
72ff7ec030 Merge branch 'next' into occlusionquery
Conflicts:
	apps/openmw/mwrender/sky.cpp
2012-03-27 23:46:48 +02:00
Lukasz Gromanowski
be94da1527 Issue #225: Initialize class members in constructor. 2012-03-27 00:34:06 +02:00
scrawl
bb3f3ce1db bugfix 2012-03-26 21:52:38 +02:00
scrawl
743ea0c9be use hardware occlusion query for sun glare effect 2012-03-24 17:59:26 +01:00
scrawl
b8f962a68d Merge branch 'next' into shaders 2012-03-23 10:26:20 +01:00
scrawl
c2329b7027 removed preprocessor constants 2012-03-18 20:32:50 +01:00
scrawl
3e4cf64a77 Merge branch 'master' into shaders 2012-03-16 20:46:18 +01:00
scrawl
5ea2122f79 sun gradually disappears 2012-03-16 20:39:58 +01:00
scrawl
a67cc8e73b more fixes 2012-03-16 19:02:33 +01:00
scrawl
877cb2aca7 much better looking moons 2012-03-15 20:35:23 +01:00
scrawl
e354203c21 stars rotation 2012-03-15 19:49:15 +01:00
scrawl
8421fd2670 fixed a visual issue with the stars 2012-03-13 19:57:33 +01:00
scrawl
118250171d Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders
Conflicts:
	apps/openmw/mwrender/objects.cpp
2012-03-13 17:31:10 +01:00
scrawl
8910b0d471 use shaders for all NIF materials. this has numerous advantages:
- vertex colours are now working as they should (and they have a huge impact on the look)
 - the lighting is per pixel and looks a lot better
 - by using shaders, we can use more lights at a time (fixed function has max of 8)
2012-03-04 20:59:23 +01:00
scrawl
d74b78a302 very minor performance improvement 2012-03-03 12:26:08 +01:00
Marc Zinnschlag
3c5f8a4a23 void pointer workaround 2012-02-29 10:13:25 +01:00
scrawl
b3db4f1c27 slightly improved moon fading 2012-02-28 15:20:46 +01:00
scrawl
8b0ef8f98c improvements to sun glare 2012-02-26 20:46:09 +01:00
scrawl
932983c2fa fix toggleSky 2012-02-26 18:21:11 +01:00
scrawl
c1d39bb35f tweaked cloud color 2012-02-26 15:54:52 +01:00
scrawl
f79bf1f300 fog 2012-02-26 13:13:29 +01:00
scrawl
8d5783d75d - set moon phase using (day%32)/4 (not really correct, but good for now)
- added all weather patterns from morrowind.ini
2012-02-25 21:06:03 +01:00
scrawl
e31ad90802 moon positions and fading 2012-02-25 16:36:45 +01:00
scrawl
4650672bb1 thunderstorm 2012-02-25 13:46:17 +01:00
scrawl
0ebdce543a - added night sky rendering with stars, nebulas, and fading in/out to sunset / sunrise
- changed WeatherGlobals members to static
2012-02-24 23:26:38 +01:00
scrawl
9560904d8a visibility fixes 2012-02-24 18:47:09 +01:00
scrawl
67c7b965f0 calculate a sun position depending on time of day 2012-02-24 18:30:16 +01:00
scrawl
811c4a41b7 fade in/out for sunrise and sunset 2012-02-24 17:42:31 +01:00
scrawl
aad8f6605e send a raycast through the physics engine to check if sun is visible 2012-02-24 16:12:43 +01:00
scrawl
af83742e6f - disable the sky renderer completely in interior cells
- SkyManager update (initial sun glare effect, no raycast)
2012-02-23 21:44:56 +01:00
scrawl
d9c02ca526 - added isCellExterior / isCellQuasiExterior methods to World
- interior now have the sun disabled properly (and ambient managed by cell, not sky)
2012-02-23 21:12:06 +01:00
scrawl
90af78e3b8 attempt to fix openmw's lighting (restored the sun, set proper ambient value outside)
- the fix should remain in this branch since the main branch still has the lighting by caelum
2012-02-23 20:33:34 +01:00
scrawl
a5720e9a4f set sky colors according to time of day 2012-02-23 19:49:56 +01:00
scrawl
41a8b22ebd implemented weather transitions (currently only blends the clouds) 2012-02-22 19:17:37 +01:00
scrawl
b2de9e8f45 allow setting the clouds opacity 2012-02-21 22:11:41 +01:00
scrawl
83753dc384 tweaked the cloud animation speed 2012-02-21 17:42:43 +01:00
scrawl
91ffacbb6d added moon phases 2012-02-21 17:38:15 +01:00
scrawl
10ca67c0a5 fixed the sky elements positioning delay (nodes are now children of the camera node) 2012-02-21 16:49:28 +01:00
scrawl
2d8b0a4ac0 merged the sky manager implementation with its interface 2012-02-21 16:15:38 +01:00
scrawl
694a537b57 - removed caelum sources, resources, build scripts 2012-02-21 00:14:20 +01:00
scrawl
04d7db2860 moved the SkyManager implementation to a new source file (sky_impl.cpp) for convenience 2012-02-20 23:53:17 +01:00
scrawl
6aac3d4b77 - removed caelum (we can get it from the git history, if needed)
- added code for moon rendering (they are not visible by default)
2012-02-20 23:41:22 +01:00
scrawl
090c0586a0 leak fix 2012-02-20 22:20:34 +01:00
scrawl
6d37f53fa2 - abstracted the sun creation code into a CelestialBody class to be reused for the moons
- fixed render queue problem
2012-02-20 22:15:13 +01:00
scrawl
ad0f9f4bcf fixed the sun rendering (rendered without depth check) 2012-02-20 21:32:12 +01:00
scrawl
3b3218d907 fixed 3 gcc warnings in sky.cpp 2012-02-20 18:45:04 +01:00
scrawl
8b5da06fce Merge branch 'next' into weather
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
2012-02-20 18:33:13 +01:00
scrawl
c884f70a61 added sun rendering (unfinished) 2012-02-20 00:52:44 +01:00
scrawl
1d9f0f4813 added MWSkyManager; already has atmosphere and moving clouds (although their colour is static) 2012-02-19 23:09:14 +01:00
Jan-Peter Nilsson
429775d485 Store configuration in /etc/openmw/ and ~/.openmw/ on linux
Requires new openengine version.
2011-01-12 18:18:06 +01:00
Marc Zinnschlag
2d8fbc6e55 implemented month variable and fixed some day/gamehour bugs 2010-07-22 11:48:27 +02:00
Marc Zinnschlag
f3b70e05a9 added sky-related script functions and instructions 2010-07-18 19:48:02 +02:00
Nicolay Korslund
a26641cca1 Moved caelum resources into the right place in the repo, instead of having cmake make redundant copies. Also fixed file modes/line endings. 2010-06-28 11:36:58 +02:00
athile
82bbc69453 Only push the far clip plane out if the sky is enabled 2010-06-27 17:28:49 -07:00
athile
7db274f1c5 Sky rendering clean-up and correct resource configuration 2010-06-27 16:44:15 -07:00