Marc Zinnschlag
7076ea9467
Merge remote-tracking branch 'scrawl/map'
2013-09-02 10:55:12 +02:00
scrawl
3ddeb075fb
Fix a cell border seam on the map
2013-08-31 04:36:23 +02:00
scrawl
f12d5b728a
Ogre 1.9 compatibility changes
2013-08-29 17:14:25 +02:00
scrawl
839d251cc5
Renamed Terrain::Terrain to Terrain::World to make VC happy
2013-08-27 16:01:16 +02:00
scrawl
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
2013-08-27 15:48:13 +02:00
Marc Zinnschlag
dcc55b60c3
Merge remote-tracking branch 'kcat/misc-cleanup'
2013-08-26 08:51:19 +02:00
Chris Robinson
0463dc0653
Use a smaller static geometry size for interior cells
2013-08-25 16:08:43 -07:00
Chris Robinson
bd6dd071aa
Use the non-accumulation root's parent as the accumulation root
...
This relies on the non-accumulation root not being the skeleton root. I haven't
found an instance where this isn't the case.
2013-08-25 16:08:42 -07:00
scrawl
5af89a9e8f
Fix an AABB assert for loading empty exterior cells
2013-08-26 00:13:42 +02:00
scrawl
1adce8afb3
Fix ambient light getting set from the cell data for non-interior cells
2013-08-22 10:47:48 +02:00
scrawl
ce5ea6d7d2
Use a proper node hierarchy; disconnect the root when entering interior
2013-08-21 17:26:11 +02:00
Chris Robinson
0e56b2facb
Merge remote-tracking branch 'zini/master' into physics
2013-08-20 04:42:28 -07:00
scrawl
ecf7786d11
terrain_num_lights was removed
2013-08-20 12:31:47 +02:00
scrawl
fa76d1631b
Some terrain fixes
2013-08-20 12:08:46 +02:00
Chris Robinson
a993af53e7
Merge remote-tracking branch 'zini/master' into physics
2013-08-20 02:21:44 -07:00
scrawl
8c8653160d
Crash fix, material fix
2013-08-20 09:52:27 +02:00
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
2013-08-19 20:39:37 +02:00
scrawl
e27437f8ed
New terrain renderer - improvements:
...
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
- Fixes several blending issues and cell border seams
- Fix map render to use the terrain bounding box instead of an arbitrary height
- Different LODs are now properly connected instead of using skirts
- Support self shadowing
- Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
- Support a fixed function fallback (though the splatting shader usually performs better)
- Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
2013-08-19 20:34:20 +02:00
Chris Robinson
3ca4d54bf9
Better handle animations with a 0-length loop
2013-08-19 07:26:42 -07:00
Chris Robinson
75131e6a48
Rebuild the actor after switching between werewolf forms
2013-08-08 17:16:24 -07:00
Chris Robinson
d77d60cbc2
Remove an unneeded forceUpdate method
2013-08-08 15:37:08 -07:00
Chris Robinson
1f6055d54b
Don't try to apply body skins for werewolves
...
They instead use a hidden WerewolfRobe object for their body
2013-08-08 04:40:31 -07:00
Chris Robinson
9694b18d1b
Update part skeletons immediately when added
2013-08-08 04:40:30 -07:00
Chris Robinson
f73578a832
Remove unnecessary mBodyPrefix field
2013-08-08 04:40:30 -07:00
Chris Robinson
5051544144
Remove some duplicate code
2013-08-08 04:40:30 -07:00
Chris Robinson
ceed2e30b8
Handle NPCs being a werewolf in NpcAnimation
...
Note that the body mesh comes from having a WerewolfRobe force-equipped.
2013-08-08 04:40:30 -07:00
Chris Robinson
5ac82a50b7
Remove unused function
2013-08-08 04:40:30 -07:00
Chris Robinson
076e7d8e16
Make insertBegin internal
2013-08-07 03:56:07 -07:00
Chris Robinson
2b2101958d
Destroy the scene node we create
2013-08-07 03:56:07 -07:00
Chris Robinson
0458fd5531
Remove unused/unneeded parameters
2013-08-07 03:56:06 -07:00
Marc Zinnschlag
932fffd1a7
Merge remote-tracking branch 'kcat/light-objects'
2013-08-07 11:21:01 +02:00
Chris Robinson
b4b095ca72
Don't try to get the center of a null bounding box
2013-08-07 01:32:36 -07:00
Chris Robinson
80d271aeb1
Remove unused stuff
2013-08-07 01:31:01 -07:00
Chris Robinson
3555476dfd
Use Animation-derived objects for generic objects
2013-08-06 19:49:07 -07:00
Chris Robinson
a9dca21d05
Create the Animation SceneNode in the constructor
2013-08-06 19:49:05 -07:00
Chris Robinson
48784c7e2f
Use for_each and functors to avoid some for loops
2013-08-06 19:49:05 -07:00
Chris Robinson
de95926e9f
Use controllers to animate lights in ObjectLists
2013-08-06 19:49:04 -07:00
Chris Robinson
8984d8f8ee
Use a map to simplify NPC part referencing
2013-08-06 19:49:02 -07:00
Chris Robinson
e976bb16c5
Add a light for torches
2013-08-06 19:49:02 -07:00
Chris Robinson
57fb065a86
Add Ogre::Light objects to the object list
...
Note that NIFs actually have NiLight-based light records which could be
used to create Ogre::Light objects. However, no Morrowind NIF uses them,
as far as I can tell.
2013-08-06 19:49:01 -07:00
Chris Robinson
1f436f9886
Render torches
2013-08-06 19:49:01 -07:00
scrawl
3f7daa4884
Forgot to change initTerrainTextures
2013-08-07 02:58:03 +02:00
scrawl
76e538c22a
Unused variable fix
2013-08-07 02:03:23 +02:00
scrawl
726c93c365
Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10
2013-08-07 01:34:17 +02:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
scrawl
90a5d8b6f5
Fix uninitialized AL listener position/orientation when the game is paused during the first frame
2013-07-30 23:24:18 +02:00
Sebastian Wick
7c24c0a64e
fix uninitialized variables
2013-07-29 16:45:35 +02:00
Sebastian Wick
d2b7cb5bb2
First/Third person transitions with mouse wheel
2013-07-29 16:43:16 +02:00
Marc Zinnschlag
3fa4a194a7
Merge remote-tracking branch 'scrawl/master'
2013-07-29 09:59:23 +02:00
scrawl
6164e5bae6
Restored window resizing
2013-07-29 02:32:08 +02:00
