Commit Graph

285 Commits

Author SHA1 Message Date
Erik Broberg baf8fa32ef Added class FrustrumCuller for CPU testing points wrt view frustrum 2016-04-12 20:33:08 -04:00
kbladin 05569611da Created clipmap geometry 2016-04-12 13:44:28 -04:00
Erik Broberg 3c8956ac96 ChunkNode do not inherti from Renderable 2016-04-12 12:00:22 -04:00
Emil Axelsson 48bd41ad9f merge in changes from develop 2016-04-12 16:29:35 +02:00
Erik Broberg 0784fe22f8 Using log2 for calculating desired split level, but have to fake earth radius in ChunkLodGlobe 2016-04-11 20:52:08 -04:00
kbladin 48109dd664 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-11 17:35:00 -04:00
kbladin 21eab66080 Add new class ClipMapGeometry. 2016-04-11 17:34:50 -04:00
Erik Broberg 459633c0d3 Removed unused converter class 2016-04-11 17:17:43 -04:00
Erik Broberg 7dfcd7abcb Refactored RenderableLatLonPatch to a simple base class PatchRenderer 2016-04-11 16:57:47 -04:00
kbladin 7592edf024 Solve merge conflict and removed unused code. 2016-04-11 13:41:06 -04:00
kbladin 552bdc1786 Remove NURBS interpolation in favor of global lat-lon maping in shader due to mis match in UV coordinates. 2016-04-11 12:09:45 -04:00
Erik Broberg 2e0e7a5bcc Refactoring. Cleaning up Latitude and Longitude representation and logic 2016-04-11 12:04:20 -04:00
Alexander Bock e4f8f8c830 Clang compile fixes 2016-04-11 11:18:50 -04:00
Emil Axelsson 4ff0205eae bring in support for multiresolution volume rendering 2016-04-11 16:56:44 +02:00
kbladin 4e0fc13035 Two patches to imitate clipmaps. Apparently the UV coordinates are not mapped correctly on the sphere patches which is a big problem. 2016-04-08 16:06:06 -04:00
kbladin cb9cce717c Cleaned up code in latlonpatch. 2016-04-08 12:33:51 -04:00
Erik Broberg 61883afd2f Sending dummy UVs from simple_vs to simple_fs to avoid shader crash 2016-04-08 10:38:18 -04:00
Alexander Bock 3de5fb3b55 Add FloatProperty to RenderableStars to modify transparency (closing #150) 2016-04-08 15:11:46 +02:00
Alexander Bock 72ccfe51e9 Ignore empty lines in Speck file reading (closing #133) 2016-04-08 15:06:13 +02:00
Alexander Bock 8f4d3c20eb Untabify RenderableStars 2016-04-08 15:00:43 +02:00
Alexander Bock 7c750ff2a2 Merge branch 'develop' into feature/newhorizons 2016-04-08 13:54:23 +02:00
kbladin b0cd9fb7d7 Solve merge conflicts and changed rendering color for simple fragment shader. 2016-04-07 21:24:41 -04:00
Erik Broberg d0773bcf32 Distant dependent LOD geometry. Demo purpose only. 2016-04-07 20:54:52 -04:00
kbladin 83d55b87f8 Nurbs working to exactly define spherical patches. Ugly code but it can be cleaned up. 2016-04-07 20:49:52 -04:00
kbladin 16349686d5 Using NURBS to interpolate patch vertex positions. 2016-04-07 15:25:33 -04:00
Alexander Bock 2acb2cbd92 Updated ghoul repository
Make use of automatic conversion and swizzling of textures
2016-04-07 19:07:18 +02:00
Erik Broberg efe2bef2d4 Created Chunk LOD Globe. Currently renders patches at constant depth 2016-04-06 17:10:29 -04:00
Erik Broberg 4b03915977 Resolved merge conflict 2016-04-06 11:02:14 -04:00
Erik Broberg b0ab03bb37 Added ChunkNode class 2016-04-05 19:14:50 -04:00
kbladin f9a98a2d2a Lat lon patch follows camera and gets projected to a sphere. 2016-04-05 18:09:29 -04:00
kbladin ee425a7d01 Implementing a patch class that will be used for clipmaps. 2016-04-05 14:45:03 -04:00
Erik Broberg d414003424 added files for Quadtree class and unit test file 2016-04-04 15:16:47 -04:00
Alexander Bock e23a1f3e3c Fix compilatioon of renderablefieldlines 2016-04-04 20:26:27 +02:00
kbladin 1a4e115ca9 globemesh extends renderable. 2016-04-04 12:46:41 -04:00
kbladin b8e8afaed8 Solve new compilation error 2016-04-04 12:29:01 -04:00
Karl Bladin ff74f0794c Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-04 12:12:19 -04:00
Karl Bladin 972af8b5f3 Solve merge conflict. 2016-04-04 12:04:46 -04:00
Karl Bladin 4b62c337e0 Rename planetbrowsing to globebrowsing 2016-04-04 12:01:39 -04:00
Erik Broberg 4526bb6eab resolved conflict 2016-04-01 13:49:59 -04:00
Erik Broberg ec93254a65 Geometry data uploading to GPU done lazily on render 2016-04-01 13:40:11 -04:00
Karl Bladin e2981a5ceb Merge branch 'feature/planetbrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/planetbrowsing 2016-04-01 13:27:18 -04:00
Karl Bladin 6a03d89861 Using gridgeometry to render planetmesh 2016-04-01 13:27:11 -04:00
Erik Broberg 3bad4097d1 Resolved conflict 2016-04-01 13:14:26 -04:00
Erik Broberg 856dec4c12 updated cmakelists 2016-04-01 13:10:30 -04:00
Karl Bladin 0c86cf07ff Solved merge conflicts. 2016-04-01 13:07:21 -04:00
Erik Broberg 109cd463a8 GridGeometry knows its resolution 2016-04-01 12:55:36 -04:00
Karl Bladin ffa633c068 Using the distanceswitch to determine what to render. 2016-04-01 12:55:36 -04:00
Karl Bladin 2057da6ece Added class PlanetMesh and rendering it through Planet. 2016-04-01 11:54:30 -04:00
Karl Bladin b1f308647d Removed transparency parameter. 2016-04-01 10:11:38 -04:00
Karl Bladin 8c5e8d5097 Remove unused code from planet class. 2016-03-31 16:55:36 -04:00