Commit Graph

1770 Commits

Author SHA1 Message Date
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
Alexander Bock 1db0a72674 Merge branch 'develop' into feature/newhorizons 2016-03-11 01:27:12 +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 dc46d81cdb Merge branch 'develop' releases/v0.3.1 2016-03-03 00:39:17 +01:00
Alexander Bock 257f90d1ec Moving Kameleon subrepository to Github 2016-03-02 21:48:56 +01:00
Alexander Bock e07397b755 Merge branch 'develop' 2016-02-22 21:45:57 +01:00
Alexander Bock 598409c4d1 Fix for crash from double deinitialization 2016-02-22 21:41:35 +01:00
Alexander Bock 2b7a532f57 Merge branch 'develop' 2016-02-21 14:22:14 +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 2c9a98a5a5 Remove data directory 2016-02-21 02:38:20 +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
Alexander Bock 7b1670ea0b Remove startup warnings 2016-02-21 01:50:51 +01:00
Alexander Bock 60cfa1c080 Updated Ghoul version 2016-02-20 17:53:16 +01:00
Alexander Bock 3a68ea6c2b Merge branch 'develop' into feature/newhorizons 2016-02-09 12:52:19 +01:00
Emil Axelsson c87eb5dd26 - increase fisheye resolution
- set correct aspect ratio of planar projection
2016-02-09 11:48:32 +01:00
Emil Axelsson 73cf15beb6 - Add currentDrawBufferResolution method in WindowWrapper
- Base renderer resolution on draw buffer resolution instead of window res
- Obtain number of aa samples from config file, instead of hard coding to
  eight samples
2016-02-09 10:46:51 +01:00
Emil Axelsson ebbbbb2dfd Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/rendering/renderengine.cpp
2016-02-08 15:07:38 +01:00
Emil Axelsson 781ca62742 fix bugs in fisheye rendering 2016-02-08 14:33:19 +01:00
Alexander Bock 91e9692afd Merge branch 'develop' into feature/newhorizons 2016-02-07 20:37:31 +01:00
Alexander Bock dd98cef974 Enable the RenderableShadowCylinder's color to be set via properties 2016-02-07 20:37:11 +01:00
Alexander Bock 66fdf4b6a4 Increasing required Visual Studio version to 2015
Moving external library handling from OpenSpace to Ghoul
2016-02-07 20:35:25 +01:00
Alexander Bock 50f1743067 Make onscreen gui not break if resolution is changed 2016-02-07 15:09:25 +01:00
Alexander Bock 312d52c038 Minor changes 2016-02-07 14:05:59 +01:00
Alexander Bock cae966ba56 Remove the hard-coded ABuffer implementation for support on Mac 2016-02-07 14:05:54 +01:00
Alexander Bock 54c2304461 Update ghoul for image texture loading 2016-02-07 14:05:49 +01:00
Alexander Bock 71f7a1958b Change single.xml to use PlanarProjection and (0,0,0) user pos instead
Remove computed detection of view direction
2016-02-07 14:05:44 +01:00
Alexander Bock 2117334b15 Minor changes 2016-02-07 14:03:04 +01:00
Alexander Bock 44d884960b Remove the hard-coded ABuffer implementation for support on Mac 2016-02-06 19:12:29 +01:00
Alexander Bock 351e38471d Update ghoul for image texture loading 2016-02-06 18:46:03 +01:00
Alexander Bock 0ec155713b Change single.xml to use PlanarProjection and (0,0,0) user pos instead
Remove computed detection of view direction
2016-02-06 12:45:48 +01:00