Commit Graph

78 Commits

Author SHA1 Message Date
Michael Nilsson 7549beb5f2 solve merge conflict 2016-05-17 12:53:29 -04: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
Michael Nilsson 0d49076c54 solve merge conflict with develop 2016-05-03 17:11:28 -04:00
Sebastian Piwell dfd1968f0b Lua script to add cygnet 2016-05-03 13:24:17 -04:00
Alexander Bock d237ae4e1c Remove generated shaders path 2016-05-01 13:16:26 +02:00
Alexander Bock 75175512a8 First implementation of moving the startup scripts into the scene description files 2016-04-27 16:46:31 +02:00
Michael Nilsson 07dfafeddb solve merge conflict with develop 2016-04-20 15:03:51 -04:00
Alexander Bock a59a1bd758 Turn off logging flush for increased performance 2016-04-18 15:15:42 +02:00
Alexander Bock ef2981f535 Enable global variables for module Lua scripts (closing #172)
Adapt New Horizons kernels to global switch between accurate and publicly avaiable kernels
2016-04-14 22:33:28 -04:00
Sebastian Piwell fa3fc8dc87 Transfer function to dataplan and ColorBar 2016-04-13 11:36:43 -04:00
Michael Nilsson ba57bd4cf8 solve merge conflict 2016-03-31 09:50:50 -04:00
Sebastian Piwell c935ce6fe0 renamed module dataplane to iswa 2016-03-30 15:27:31 -04:00
Sebastian Piwell 48978f38fc removed mouseinteraction test for screenspacerenderables 2016-03-21 09:20:47 -04:00
Sebastian Piwell 5c81ad94f0 Simple test dataplane 2016-03-18 17:55:22 -04:00
Sebastian Piwell 8bc736acec Add render functions to screenspaceframebuffer 2016-03-17 17:52:07 -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
Alexander Bock cae966ba56 Remove the hard-coded ABuffer implementation for support on Mac 2016-02-07 14:05:54 +01:00
Alexander Bock 7e3024959a Remove the disabling of the blend function after an image projection that caused flickering
Set the window resolution in the framebuffer renderer
Fix spelling errors in CK kernel error messages
Reference new leap second kernel
2016-02-05 20:48:35 +01:00
Emil Axelsson a6a9537b6c Merge with antialiased abuffer 2016-02-03 17:47:29 +01:00
Emil Axelsson d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock bae8d0aa76 Making OpenSpaceTest application compile with API change
Set default start to July 2015
Move default window out of the corner
Compile fixes
2016-01-14 16:05:29 +01:00
Alexander Bock d84edc4090 More work on transitioning to windowwrapper for keyboard and mouse interaction 2015-10-25 17:34:03 -05:00
Alexander Bock 7bf24ec74e Remove the rendering method override 2015-06-26 23:31:51 +02:00
Alexander Bock 4411a4e4b2 Disable postFX for global blackout 2015-06-18 16:19:25 +02:00
Alexander Bock 613b6b3193 Move Spice kernels to new location
Enable loading of openspace.cfg in Loader
Make save locations based on FileSys tokens
Disable LIBCMT linking of applications that link against libOpenSpace
2015-06-17 00:23:57 +02:00
Alexander Bock e212d0b34f Making SyncWidget and ShortcutWidget modal windows
Enable correct progress callback for DownloadManager
2015-06-14 20:17:09 +02:00
Alexander Bock da812f3564 More cleanup of Launcher
Added Infowidget
2015-06-12 23:48:11 +02:00
Alexander Bock f1791d9816 Merge branch 'develop' into feature/downloadmanager
Conflicts:
	openspace.cfg
	src/engine/openspaceengine.cpp
	support/cmake/support_macros.cmake
2015-06-10 02:13:32 +02:00
Alexander Bock 8ad7702b75 Automatically detect which rendering method to use based on the available OpenGL version 2015-06-03 13:31:42 +02:00
Alexander Bock a9e3044d6a Changed openspace-data file token to point to correct data folder
Print detected OpenGL version
2015-06-03 12:36:20 +02:00
Alexander Bock 38c2477492 Rename DownloadEngine to DownloadManager 2015-05-27 17:14:20 +02:00
Alexander Bock 3a8a178c6a Undo change in openspace.cfg 2015-05-25 19:38:21 +02:00
Alexander Bock 659326b9a9 Remove 1500+ memory leaks in OpenSpace and Ghoul 2015-05-25 19:37:56 +02:00
Alexander Bock ca7dcd4762 Move shaders into their correct modules
Add path determination to modules that automatically sets correct path resolve tokens
2015-05-21 15:17:38 +02:00
Alexander Bock e51df4b2a0 Sorting more classes into the correct modules 2015-05-20 21:40:52 +02:00
Alexander Bock 523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Alexander Bock abdd1af2a9 Cleaning up abuffer classes
Make ABuffer type selectable in openspace.cfg
2015-05-19 00:47:47 +02:00
Alexander Bock a8d97089e5 Write HTML log on default 2015-05-07 22:29:59 +02:00
Anton Arbring d3bf8eb7f7 Merge branch 'timeadjustments' into NewHorizonsMerge
Conflicts:
	CMakeLists.txt
	include/openspace/rendering/model/modelgeometry.h
	include/openspace/rendering/model/wavefrontgeometry.h
	include/openspace/rendering/planets/renderableplanetprojection.h
	include/openspace/util/imagesequencer.h
	scripts/default_startup.lua
	src/abuffer/abuffer.cpp
	src/rendering/model/renderablemodel.cpp
	src/rendering/model/wavefrontgeometry.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/planets/renderableplanetprojection.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderabletrail.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/spiceephemeris.cpp
	src/util/imagesequencer.cpp
2015-04-23 22:51:55 -04:00
Alexander Bock 9b24f407a6 Moving test files into base directory
Adding empty class of SceneGraphLoader
2015-04-07 19:01:04 +02:00
Michal Marcinkowski cae39f2788 updates to the imagesequencing & renderableplanet projection classes mainly 2015-03-24 12:31:03 -04:00
Alexander Bock bcfe0c6862 Remove unused line in config file 2015-03-04 20:01:55 +01:00
Alexander Bock a7bd6319db Adding 'property' prefix to subowner methods in PropertyOwner
Added function for writing documentation of properties
2015-02-22 22:05:25 +01:00
Alexander Bock 3c67788300 Disable HTML log on default
Restore default.scene
2015-02-20 13:57:56 +01:00
Alexander Bock d96b7146e3 Restore openspace.cfg 2015-02-19 11:16:02 +01:00
Michal Marcinkowski 971381b150 fov lines, check. 2015-02-18 19:41:56 -05:00
Joakim Kilby 3d04af03a3 Merge branch 'develop' into plutoViz
Conflicts:
	include/openspace/rendering/planets/simplespheregeometry.h
	include/openspace/util/powerscaledsphere.h
	openspace.cfg
	shaders/pscstandard_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderabletrail.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
2015-02-18 15:52:35 +01:00
Alexander Bock 91195db6a0 Added reasonable size to the default single.xml
Added path tokens for spice kernels
2015-02-17 22:14:52 +01:00
Alexander Bock a0fc77a893 Enable the ability to run setting scripts that are executed after the scene has been loaded 2015-02-17 20:10:50 +01:00
Alexander Bock 862bfd6947 Making most includes in openspaceengine into forward declarations 2015-02-17 10:36:18 +01:00