Commit Graph

1675 Commits

Author SHA1 Message Date
Karl Bladin 4b62c337e0 Rename planetbrowsing to globebrowsing 2016-04-04 12:01:39 -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
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
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
Jonathas Costa 69f9e21824 New Ghoul version. 2016-03-16 11:11:50 -04:00
Jonathas Costa b09026ee42 Merge branch 'develop' into MultiModelFormatReader 2016-03-16 10:44:07 -04:00
Jonathas Costa 182e332661 New Ghoul version (with Assimp library support). 2016-03-16 10:40:25 -04:00
Jonathas Costa 7e34f226ba CMake default module conf for NewHorizons. 2016-03-16 09:17:28 -04:00
Jonathas Costa f6b65ab8e0 Added entries for Windows thumbs files and Emacs backup files. 2016-03-16 09:15:31 -04:00
Jonathas Costa ae63941737 Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:13:43 -04:00
Jonathas Costa 6a2460a876 Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:13:31 -04:00
Jonathas Costa 725142334e Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:13:10 -04:00
Jonathas Costa 2fcb75003c Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:12:53 -04:00
Jonathas Costa 2e8b264717 Changes in scene configuration for the new multi-geometry loader. 2016-03-16 09:12:30 -04:00
Jonathas Costa 994530265d Added new scene files to the configuration file (These new files are commented by default). 2016-03-16 09:10:52 -04:00
Jonathas Costa be34d7c303 Added multimodelgeometry.* files to the project and removed wavefrontgeometry.* files from the project. 2016-03-16 09:08:47 -04:00
Jonathas Costa 3a9e5e5790 Removed WavefrontGeometry class register and added the MultiModelGeometry class register. 2016-03-16 09:05:16 -04:00
Jonathas Costa 7c57b870f0 Changes to accept the new multi-geometry handler, removed wavefrontgeometry header file include and identation fixes. 2016-03-16 09:03:55 -04:00
Jonathas Costa 69e8a1a163 New multi-geometry model handler. 2016-03-16 08:56:18 -04:00
Alexander Bock c3aa8fecc2 Update ghoul to account for removed boost dependency 2016-03-15 23:59:57 +01:00
Sebastian Piwell fd5f26f757 Linux/Mac Launcher fix 2016-03-08 16:44:43 -05:00
Michael Nilsson ec9261e1da fix function call to logmanager 2016-03-07 09:37:45 -05:00
Alexander Bock df0d0d1258 Update Ghoul version to accommodate public API bool parameter changes 2016-03-06 08:08:06 +01:00
Alexander Bock ff7f4f61db Reverting breaking changes on Windows 2016-03-06 04:34:41 +01:00
piwell 2d6403bdac Ghoul linux fix 2016-03-04 15:51:23 -05:00
piwell 87840bdb7f Linux fix 2016-03-04 15:06:41 -05:00
kalbl 1b8eae5157 Added texture reader and writer for SOIL in renderengine. This solves a problem when using SOIL for image reading which made the program unable to load textures. 2016-03-04 10:47:25 +01:00
Alexander Bock 257f90d1ec Moving Kameleon subrepository to Github 2016-03-02 21:48:56 +01:00
Alexander Bock 598409c4d1 Fix for crash from double deinitialization 2016-02-22 21:41:35 +01:00
Alexander Bock 6653d67a3f Update Gitignore to include data files 2016-02-21 14:12:24 +01:00
Alexander Bock 92f3707368 Use previously released kernels for New Horizons 2016-02-21 14:09:56 +01:00
Alexander Bock 1905db19ba Add files from the previous data submodule 2016-02-21 01:52:48 +01:00
Alexander Bock 58ee7647e8 Remove data submodule in preparation for direct integration 2016-02-21 01:51:13 +01:00