scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								157c11398d 
								
							 
						 
						
							
							
								
								Add terrain parallax mapping  
							
							
							
						 
						
							2016-03-22 21:46:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3f08cbff71 
								
							 
						 
						
							
							
								
								Share the state attributes for terrain techniques  
							
							... 
							
							
							
							Reduces the total amount of GL calls / frame by about 14% - 50% depending on the scene. 
							
						 
						
							2016-03-11 01:08:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								f898bf493f 
								
							 
						 
						
							
							
								
								Don't use Geodes  
							
							
							
						 
						
							2016-03-10 13:17:01 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								6a0ac824bd 
								
							 
						 
						
							
							
								
								Fix terrain error in OpenCS  
							
							
							
						 
						
							2016-02-19 15:00:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7071d286e8 
								
							 
						 
						
							
							
								
								Fix inverted check for 16-bit indices  
							
							
							
						 
						
							2016-02-19 14:59:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ca0e1fe0e0 
								
							 
						 
						
							
							
								
								Set the osg::Material on the terrain root node  
							
							
							
						 
						
							2016-02-19 01:45:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6000e48bba 
								
							 
						 
						
							
							
								
								Add terrain shaders and normal map support  
							
							... 
							
							
							
							Textures with _n filename suffix are automatically recognized as terrain normal maps. 
							
						 
						
							2016-02-19 01:37:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e05d975020 
								
							 
						 
						
							
							
								
								Change the way that texture filtering settings are applied at runtime  
							
							
							
						 
						
							2016-02-18 19:37:55 +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 
							
						 
						
							2016-02-12 14:46:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5e876b1379 
								
							 
						 
						
							
							
								
								Add missing include  
							
							
							
						 
						
							2016-02-10 15:34:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								98c5e072f2 
								
							 
						 
						
							
							
								
								Swap the terrain cache update order to make more sense  
							
							
							
						 
						
							2016-02-09 21:17:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0865cea211 
								
							 
						 
						
							
							
								
								Preload terrain  
							
							
							
						 
						
							2016-02-09 21:16:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8aba74e6ee 
								
							 
						 
						
							
							
								
								Remove GridElement  
							
							
							
						 
						
							2016-02-09 20:23:53 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								c3ad4dad75 
								
							 
						 
						
							
							
								
								Fix applying of filter settings on terrain textures  
							
							
							
						 
						
							2016-02-07 05:53:56 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9e5225bb6f 
								
							 
						 
						
							
							
								
								Do not unref a Texture's image data after applying it  
							
							
							
						 
						
							2016-02-05 23:21:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9e53e12c70 
								
							 
						 
						
							
							
								
								More renaming of TextureManager -> ImageManager  
							
							
							
						 
						
							2016-02-05 23:10:27 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								fbd4ad9b0c 
								
							 
						 
						
							
							
								
								Flip terrain textures  
							
							
							
						 
						
							2016-02-05 22:46:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								31988ca4cc 
								
							 
						 
						
							
							
								
								Add a dont_override_filter description for textures that should be left alone  
							
							
							
						 
						
							2016-02-05 21:07:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b06730ac61 
								
							 
						 
						
							
							
								
								Fix terrain textureCompileDummy  
							
							
							
						 
						
							2016-02-05 21:02:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								62169a7039 
								
							 
						 
						
							
							
								
								Use a single-precision PositionAttitudeTransform in speed critical places  
							
							
							
						 
						
							2015-11-22 19:54:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								52901ec10c 
								
							 
						 
						
							
							
								
								Do not create terrain geodes when built with OSG 3.4  
							
							
							
						 
						
							2015-11-16 15:11:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								72252d4f32 
								
							 
						 
						
							
							
								
								Terrain: restore IncrementalCompileOperation  
							
							
							
						 
						
							2015-11-06 20:22:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7ca8e45d5d 
								
							 
						 
						
							
							
								
								Terrain: remove debug code  
							
							
							
						 
						
							2015-11-06 20:21:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ef18f4217f 
								
							 
						 
						
							
							
								
								Terrain: create 4x4 terrain chunks per ESM::Cell to improve performance  
							
							... 
							
							
							
							Improves performance because the number of splatting layers per chunk is reduced, and finer grained frustum culling can be done. 
							
						 
						
							2015-11-06 20:14:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								95cf13e3f2 
								
							 
						 
						
							
							
								
								Terrain: make the blendmapSize and layerTileSize in FixedFunctionTechnique configurable  
							
							
							
						 
						
							2015-11-06 15:23:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b3f5ac5dbb 
								
							 
						 
						
							
							
								
								Include cleanup  
							
							
							
						 
						
							2015-07-25 02:11:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								98571148b0 
								
							 
						 
						
							
							
								
								Remove custom license for terrain code  
							
							... 
							
							
							
							Now that it's no longer a stand-alone component, there's not much point in custom licensing it. 
							
						 
						
							2015-06-14 20:44:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								db16cdad02 
								
							 
						 
						
							
							
								
								Add a comment  
							
							
							
						 
						
							2015-06-09 03:16:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5921e70625 
								
							 
						 
						
							
							
								
								Build a kdtree for terrain geometry  
							
							... 
							
							
							
							Improves intersection testing performance, shaving off ~2ms of frame time in exteriors.
Also increases terrain loading time by ~1ms per cell, so will have to look into background loading soon. 
							
						 
						
							2015-06-09 02:29:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e046119487 
								
							 
						 
						
							
							
								
								Fix for unnecessary terrain texture coordinate arrays  
							
							
							
						 
						
							2015-06-04 16:15:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								cd47dff196 
								
							 
						 
						
							
							
								
								Minor cleanup  
							
							
							
						 
						
							2015-06-03 03:03:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b978153edb 
								
							 
						 
						
							
							
								
								Enable VBO sharing for terrain geometry  
							
							
							
						 
						
							2015-06-03 02:24:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5666e02546 
								
							 
						 
						
							
							
								
								Fix for dark terrain in some cases  
							
							
							
						 
						
							2015-06-03 02:22:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								cdd0623009 
								
							 
						 
						
							
							
								
								Terrain rendering  
							
							
							
						 
						
							2015-06-03 01:35:41 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								83a7eea2a9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							
							
						 
						
							2015-05-03 09:54:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rohit Nirmal 
								
							 
						 
						
							
							
							
							
								
							
							
								997347b01e 
								
							 
						 
						
							
							
								
								Silence -Wreorder warnings.  
							
							
							
						 
						
							2015-04-28 18:48:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								20af2b67a8 
								
							 
						 
						
							
							
								
								Change the triangle pattern used for terrain ( Fixes   #2459 )  
							
							
							
						 
						
							2015-04-17 18:54:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								af67de73a5 
								
							 
						 
						
							
							
								
								Delete shiny  
							
							
							
						 
						
							2015-04-01 17:06:31 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									jacmoe 
								
							 
						 
						
							
							
							
							
								
							
							
								ee574e08ef 
								
							 
						 
						
							
							
								
								MIT License header added to all terrain component files.  
							
							
							
						 
						
							2015-02-09 20:16:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								f8b4ff3004 
								
							 
						 
						
							
							
								
								Documentation fix  
							
							
							
						 
						
							2015-02-05 04:18:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7b4665c623 
								
							 
						 
						
							
							
								
								Terrain: documentation update  
							
							
							
						 
						
							2015-01-13 05:37:44 +01:00