mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 05:28:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,026 Commits 85 Branches 47 Tags
4ac19f21b7f4de48b0bdb947912e280b31d6168d
Commit Graph

2026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kalle Bladin 4ac19f21b7 Solve merge conflict. 2016-05-19 12:10:14 -04:00
Alexander Bock b964cbe1a2 Remove comments in Downloadmanager 2016-05-19 13:25:47 +02:00
Alexander Bock 54fa1c8cbc Merge branch 'feature/rosetta' into develop 2016-05-19 13:24:26 +02:00
Alexander Bock caae5336b5 Make use of new thread priority scheme 
Updated Ghoul repository
 2016-05-19 13:23:40 +02:00
Alexander Bock 94bac5d886 Fix RenderableTrails artifacts with high delta time (closing #84) 2016-05-19 12:46:11 +02:00
Alexander Bock 92df988bb6 Show some information when NewHorizons is not present 2016-05-18 21:37:41 +02:00
Alexander Bock dba650c80d Create separate key bindings for rosetta mission 
Prolong rosetta trail
 2016-05-18 21:37:27 +02:00
Alexander Bock ecf1862eb3 Only show Pluto text information when NewHorizons node is present 2016-05-18 20:40:38 +02:00
Alexander Bock 7d32dba5cb Enable SingleSphereGeometry to have more segments 
Another fix for RenderablePlanetProjection heightmap offset
 2016-05-18 20:19:47 +02:00
Alexander Bock ccffe60eee Use new Rosetta kernels for image projections 2016-05-18 19:18:59 +02:00
Alexander Bock e6abbcd73a Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-05-18 19:11:54 +02:00
Alexander Bock 0c96a08afa Rename Pluto heightmap and normalmap 2016-05-18 19:11:29 +02:00
Alexander Bock 0ab3f0c026 Some fixes on heightmap displacement for RenderablePlanet 
Some fixes on heightmap displacement for RenderablePlanetProjection
Enable optional normal map on RenderablePlanetProjection
 2016-05-18 19:03:03 +02:00
Emil Axelsson fe4fde67de remove incorrect include path 2016-05-18 13:31:33 +02:00
Emil Axelsson 5cd8cdd250 Merge pull request #82 from OpenSpace/feature/dataconverter 
volume conversion tools and really basic data converter app
 2016-05-18 13:09:01 +02:00
Alexander Bock caeb8618a8 Enable heightmaps for RenderablePlanet (closing #21) 2016-05-18 12:12:28 +02:00
Emil Axelsson 2911168e5b volume conversion tools and really basic data converter app 2016-05-18 11:56:06 +02:00
Alexander Bock 2f69520331 Fix Pluto.mod file 2016-05-18 11:30:32 +02:00
Alexander Bock 74c7413115 Adding functionality to clear projections on RenderableModelProjection (closing #22) 2016-05-18 00:36:11 +02:00
Erik Broberg 2f5bd47f45 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-17 18:23:12 -04:00
Erik Broberg ce67314065 Naive and simple distance dependent interaction speed. Useful for debugging 2016-05-17 18:22:57 -04:00
Kalle Bladin 9ef9ae513e Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-17 16:54:34 -04:00
Kalle Bladin 039c5293c2 Render several texture layers on top of each other with more datasets. 2016-05-17 16:54:21 -04:00
Alexander Bock e7f728868d Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-05-17 19:47:46 +02:00
Alexander Bock ed8cebbb9d Fix crash with incidenttargetlist for rosetta 2016-05-17 19:47:41 +02:00
Alexander Bock 8a5b087d12 Remove frame limitation on single.xml 2016-05-17 19:26:11 +02:00
Alexander Bock bd90a0c44c Fix the image flipping on RenderableModelProjection 2016-05-17 19:25:59 +02:00
Erik Broberg f30a322623 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-17 13:22:55 -04:00
Erik Broberg 974fff33fd Fixed bug introduced in commit f484005... due to enum Chunk::Status was implicitely casted to bool. Changed enum to class 2016-05-17 13:22:45 -04:00
Kalle Bladin 8f394a2b80 Add local scopes to for loops in shaders. 2016-05-17 13:18:56 -04:00
Alexander Bock 27bdff4be5 Update 67P.data file to request unflipped texture map 
Update ghoul repository
 2016-05-17 19:07:35 +02:00
Michael Nilsson d2e913b70e moved histogram class to core 2016-05-17 12:49:16 -04:00
Kalle Bladin fdc4690117 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-16 20:52:14 -04:00
Kalle Bladin daf1b5873e Rendering using many layers. 2016-05-16 20:48:23 -04:00
Erik Broberg a9d34d4d25 Added thread pool class and a simple unit test 2016-05-16 20:28:16 -04:00
Erik Broberg e03258dab0 removed out-dated tests 2016-05-16 20:27:26 -04:00
Erik Broberg 025a221df2 TileProvider enqueues tiles at lower level first 2016-05-16 19:10:39 -04:00
Erik Broberg 33d1d1a31d Enable rendering smallest (i.e. closest) chunk nodes first. Toggleable from GUI 2016-05-16 14:33:28 -04:00
Erik Broberg 8639190b9e solved merge conflict: new signature for TileProvider constructor 2016-05-16 13:14:46 -04:00
Erik Broberg 6f953ecdfb Flush tile request queue every X frame. Currently set to every 60 frame 2016-05-16 13:12:52 -04:00
Kalle Bladin 2909d120e5 Try a new dataset for color texture. 2016-05-16 10:27:57 -04:00
Kalle Bladin fecfcc5bd8 Fix problems for compiling and running on OSX. 2016-05-16 10:27:20 -04:00
Alexander Bock 31e6b0e2b3 Add debugging module with RenderableDebugPlane, closing #56 2016-05-16 14:50:48 +02:00
Alexander Bock ecc6c8d63f Reintroduce powerscaled coordinates to modelgeometry to fix scaling issue 
Correctly set magnification property in RenderableModelProjection
 2016-05-16 14:44:55 +02:00
Alexander Bock ffdaeeedcc Renamed default_nh.scene to newhorizons.scene 
Remove all 'projection' suffices from newhorizons classes
 2016-05-16 09:30:27 +02:00
Alexander Bock 9fd0e02cb7 Flip placeholder texture 2016-05-16 09:16:33 +02:00
Kalle Bladin 6ddec421b7 Solve problem with too big texture tiles requested. 2016-05-13 20:27:30 -04:00
Erik Broberg 276375a799 Added gui bool for toggling merge cullable chuch nodes, and made culling view frustum static 2016-05-13 19:53:45 -04:00
Kalle Bladin c4c65c98d8 Solve merge conflict and removed rendering of borders. 2016-05-13 19:01:47 -04:00
Erik Broberg f48400523c A Chunk not visible to the camera wants to get merged. Cleaned up ChunkRender render signature 2016-05-13 18:31:44 -04:00