Commit Graph

1717 Commits

Author SHA1 Message Date
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 2b80801695 Created test class for latlonpatch 2016-04-07 15:26:23 -04:00
kbladin 16349686d5 Using NURBS to interpolate patch vertex positions. 2016-04-07 15:25:33 -04:00
Erik Broberg efe2bef2d4 Created Chunk LOD Globe. Currently renders patches at constant depth 2016-04-06 17:10:29 -04:00
Erik Broberg 25a917bf1a placed camera att nice distance 2016-04-06 17:08:20 -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 506c624a73 Created new scene with a debug globe in the center. 2016-04-05 15:37:10 -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
kbladin 66f8d79697 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-04 12:46:57 -04: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 95eca2f9b0 Solve new compilation error 2016-04-04 12:27:23 -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
Emil Axelsson 90f3193236 Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into develop 2016-04-01 17:48:45 +02:00
Emil Axelsson 568a6a3416 fix bug when numberOfSamples is 0 2016-04-01 17:47:00 +02: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
Karl Bladin c22c3b0c73 Track down the rendering problem for geometry and remove test classes. 2016-03-31 16:46:43 -04:00
Erik Broberg 9779cf83e8 renamed Geometry variable names 2016-03-31 13:14:44 -04:00
Erik Broberg 83eb210f4a Added subclass GridGeometry, and made minor changes to the base class Geometry 2016-03-31 12:34:36 -04:00
Karl Bladin 4cb806fcb8 Isolated rendering of simple sphere planet by duplicating the classes in to new ones in the new planetbrowsing module. From here the code can be reduced to fit our rendering model. 2016-03-31 12:14:06 -04:00
Erik Broberg c31d21fb63 Solved merge conflict 2016-03-30 20:18:55 -04:00
Erik Broberg 1d8d750635 Handling case where DistanceSwitch is empty 2016-03-30 20:13:06 -04:00
Erik Broberg 9d45463e93 Created class DistanceSwitch and added length() in double precision to PowerScaledCoordinate 2016-03-30 19:34:42 -04:00
Karl Bladin 9970e4ea9e Create a simple geometry class for holding vertex data and doing opengl rendering calls. 2016-03-30 19:32:53 -04:00
kalbl 360877d7ff Add new version of ghoul to solve OSX compile errors. 2016-03-30 15:29:08 -04:00
kalbl 86debebdd9 Fix compilation errors for OSX. 2016-03-30 15:20:20 -04:00
Karl Bladin 333e7886db Change name of RenderableCelestialBody to Planet 2016-03-30 12:49:54 -04:00
Karl Bladin 6504919331 Create separate module for planet browsing with an empty class for rendering planets. 2016-03-29 17:41:41 -04:00
Michael Nilsson 2ca5d52fa3 fix for linux 2016-03-28 11:25:04 -04:00
Michael Nilsson d7e4a8b8e9 update gitignor with pluto texture folders 2016-03-24 16:48:04 -04:00
Emil Axelsson 7b6a47973a add toyvolume example to data 2016-03-23 14:21:28 +01:00
Emil Axelsson 80fe89dbc8 change interfaces from pointer to reference 2016-03-23 14:00:40 +01:00