2689 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Broberg	0ef0343efd	Toggle show chunk edges from gui and calculate level weights only once per vertex	2016-06-09 17:14:46 -04:00
Erik Broberg	25d02086a1	Use separate function for getting level weights	2016-06-09 14:18:39 -04:00
Erik Broberg	7ac8e37807	Rename TextureTile to Tile in shader for better correspondance with its CPU counterpart	2016-06-09 13:22:44 -04:00
Erik Broberg	bc19a826bf	Factor out tile texture sampling	2016-06-09 12:44:16 -04:00
Kalle Bladin	92c468426b	Add night texture dataset	2016-06-08 22:48:53 -04:00
Kalle Bladin	99a06b88a4	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-08 22:38:58 -04:00
Kalle Bladin	ebdcfcfa44	Update water rendering.	2016-06-08 22:38:43 -04:00
Erik Broberg	b9c4c80491	Use preprocessed chunk bounding heights for chunk culling when possible	2016-06-08 22:03:29 -04:00
Kalle Bladin	2fc61dcf6d	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-08 21:44:58 -04:00
Kalle Bladin	bd5b0de144	fix crash bug for local rendering.	2016-06-08 21:43:36 -04:00
Kalle Bladin	3980aeff57	Add the layer types water mask, nighttexture, and overlay as well as the option to toggle atmosphere.	2016-06-08 21:30:19 -04:00
Erik Broberg	37b500b001	FrustumCuller and HorizonCullers implements virtual ChunkCuller and managed by ChunkedLodGlobe	2016-06-08 19:59:45 -04:00
Erik Broberg	1f1c02d42a	Remove patchrenderer.cpp	2016-06-08 18:04:06 -04:00
Erik Broberg	22acf6b529	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-08 18:02:11 -04:00
Erik Broberg	0fff28f53d	Remove baseclass PatchRenderer and rename patchrenderer.* to chunkrenderer.*	2016-06-08 18:01:54 -04:00
Kalle Bladin	6f6e9b3e1d	Merge branch 'feature/globe-atmosphere' of github.com:OpenSpace/OpenSpace-Development into feature/globe-atmosphere	2016-06-08 17:42:48 -04:00
Kalle Bladin	b84f5cfc05	Merge branch 'feature/globebrowsing' into feature/globe-atmosphere	2016-06-08 17:42:38 -04:00
Kalle Bladin	5e9fb5b05b	Commented away use of border overlay.	2016-06-08 17:41:58 -04:00
Erik Broberg	9c3a50bb22	Merge branch 'feature/globebrowsing' into feature/globe-atmosphere	2016-06-08 15:15:09 -04:00
Erik Broberg	ba52acd270	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-08 15:13:28 -04:00
Erik Broberg	bf5f353972	Factor out a lot of common code in ChunkRenderer	2016-06-08 15:13:04 -04:00
Jonathas Costa	335e183363	Fixed include path.	2016-06-08 14:34:04 -04:00
Kalle Bladin	884d09f733	Merge branch 'feature/globebrowsing' into feature/globe-atmosphere	2016-06-08 12:51:27 -04:00
Kalle Bladin	869be5dc44	Add glsl function to calculate intersection of ellipsoid.	2016-06-08 12:50:33 -04:00
Kalle Bladin	562e249dc9	Merge branch 'develop' into feature/globebrowsing	2016-06-08 12:32:31 -04:00
Erik Broberg	3c0aa69b16	Move call to TileProviderManager::prerender() from patchrenderer to RenderableGlobe	2016-06-08 12:05:38 -04:00
Kalle Bladin	f5ecb76358	Fox compilation error for OSX	2016-06-08 11:02:09 -04:00
Emil Axelsson	73ceaafd13	merge	2016-06-08 15:02:10 +02:00
Emil Axelsson	8771a238d3	improve galaxy rendering	2016-06-08 15:00:03 +02:00
Erik Broberg	7377d098cc	Solve merge conflict	2016-06-08 00:36:35 -04:00
Erik Broberg	7d1f1bd3ce	Redefining Tile data structures. Tiles now have a TilePreprocessData pointer and a Status	2016-06-07 23:13:54 -04:00
Kalle Bladin	ec22683568	Use spice ephemeris for renderable globe. Still not considering rotation in rendering.	2016-06-07 22:47:05 -04:00
Erik Broberg	d0c7fe180f	Merge similar structs RawTileData and TileIOResult	2016-06-07 21:16:43 -04:00
Erik Broberg	607356f10b	Remove redundant information from RawTileData	2016-06-07 20:48:48 -04:00
Kalle Bladin	d36c33cbb6	Update other modules to work with the new interaction mode and camera class.	2016-06-07 19:51:37 -04:00
Erik Broberg	887b26e441	Move numRasters to be part of DataLayout instead of DataRegion	2016-06-07 19:42:29 -04:00
Erik Broberg	28b3afc604	Add ability to do per tile preprocessing, such as calculate min max values	2016-06-07 18:54:51 -04:00
Kalle Bladin	dce89545d3	Remove option to toggle use of height map and color texture and fix related crash bug.	2016-06-07 18:36:01 -04:00
Kalle Bladin	bc21643f06	Add the ability to change the interaction mode dynamically and via lua script.	2016-06-07 17:25:00 -04:00
Kalle Bladin	674700d2b9	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-07 12:55:10 -04:00
Kalle Bladin	012bcaefaf	Solve merge conflicts.	2016-06-07 12:54:52 -04:00
Erik Broberg	5f77efebb3	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-07 12:45:15 -04:00
Erik Broberg	4ac7e5b533	Add a means of comparing AABBs and basic tests	2016-06-07 12:32:30 -04:00
Kalle Bladin	05e0e8254b	Double precition for view frustum culling is not used in camera space.	2016-06-07 12:03:31 -04:00
Erik Broberg	1cd06aa3c8	Add basic tests for AABB contains and intersect	2016-06-07 12:02:27 -04:00
Alexander Bock	146b71e129	Make performance widget graphs fill from right to left instead of circular releases/v0.3.3	2016-06-07 11:16:27 +02:00
Erik Broberg	937cbabe21	Add method contains() to class AABB	2016-06-06 17:46:02 -04:00
Kalle Bladin	7ec7bbecea	Remove OpenStreetMap dataset from debugglobe	2016-06-06 17:43:34 -04:00
Kalle Bladin	e251e6f60f	Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-06-06 17:40:34 -04:00
Kalle Bladin	ba437809e0	Update culling to be done with double precision.	2016-06-06 17:40:11 -04:00