Commit Graph

381 Commits

Author SHA1 Message Date
Alexander Bock b18ccfad23 Add DownloadEngine
Add curl library
2015-05-27 16:47:45 +02:00
Alexander Bock 77cc5dba49 Moving onscreen gui into its own module 2015-05-26 22:52:12 +02:00
Alexander Bock 659326b9a9 Remove 1500+ memory leaks in OpenSpace and Ghoul 2015-05-25 19:37:56 +02:00
Alexander Bock b840631813 Making Visual Leak Detector work 2015-05-25 17:28:11 +02:00
Alexander Bock f1e6ad6f3d Remove more warnings 2015-05-23 22:42:51 +02:00
Alexander Bock ef58668b81 Making OpenSpace compile and run when the NewHorizons module is not loaded 2015-05-23 20:47:06 +02:00
Alexander Bock 433d0ba3a6 Fixing CMake for Mac OS 2015-05-23 19:50:03 +02:00
Joakim Kilby 98b06af6d1 Linker error fixes
Adapted OpenSpace Version to different naming for defines
2015-05-22 14:24:00 +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 59e474d5cd Modularize the newhorizons and volume classes 2015-05-20 21:08:21 +02:00
Alexander Bock 523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Alexander Bock 4de4c015d7 Starting to clean out constants.h file by moving constants into the relevant classes 2015-05-20 16:32:28 +02:00
Alexander Bock abc8f7a5d8 Make OpenSpace use new Cache version 2015-05-20 03:07:09 +02:00
Alexander Bock 683ce14449 Various cleanups in main.cpp
Adapted to new Ghoul version
2015-05-19 13:58:00 +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 79673d5f53 Do not log OpenGL version if the default version is used 2015-05-18 19:26:09 +02:00
Alexander Bock 6fdd172428 Fix initialization order of image sequencer to remove an error of unknown token 2015-05-18 19:18:35 +02:00
Alexander Bock 597ed14014 Fixing CREDITS file
Removing many of clang warnings
2015-05-13 19:33:34 +02:00
Alexander Bock 28abe46bcf Fixing various issues that appeared in Mac
Fixing flat qualifier in shader
Fix default values
Disable postFX shader
2015-05-13 16:52:25 +02:00
Alexander Bock 94c1e6e23c Only create a handle message event with the correct size (in preparation for binary external controls) 2015-05-13 00:52:52 +02:00
Alexander Bock 0c655e98f2 Merge remote-tracking branch 'origin/NewHorizonsMerge' into feature/timelinegui
Conflicts:
	src/rendering/renderengine.cpp
	src/util/imagesequencer2.cpp
2015-05-05 11:42:49 +02:00
Alexander Bock 4f8c1e4a14 Added methods to Hongkang parser that publish the results
More changes to the TImeline GUI
2015-05-02 22:24:03 +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
Michal Marcinkowski 7b9fc28f33 Merge branch 'timeadjustments' of openspace.itn.liu.se:/openspace into timeadjustments 2015-04-22 21:54:05 -04:00
Michal Marcinkowski 8becbbde41 Imagesequencer update:
- label/image data works
- fixed issues with instrument firing
- read handled in more uniform way
- adding ALICE scanner
- distance fading in renderabletrail (WIP)
- essential fixes to renderableFOV
- and additional changes to other classes reliant on imagesequenser.
2015-04-22 21:53:28 -04:00
Alexander Bock 19417d87c8 Moved networking functions into their own engine class 2015-04-22 18:22:19 +02:00
Alexander Bock f5f1b03bc8 More Linux fixes 2015-04-17 13:45:20 +02:00
Alexander Bock 79f3052887 More work on SceneGraphLoader
Renamed SceneGraph to Scene
Added new class SceneGraph to handle scenegraph related tasks
2015-04-09 21:43:13 +02:00
Michal Marcinkowski d124209281 new imagesequencer class - WIP.
Temporarily calling it "imagesequencer2"
2015-04-09 12:36:05 -04:00
Alexander Bock 5a2c1b8c73 More work on SceneGraphLoader 2015-04-08 14:47:09 +02:00
Michal Marcinkowski cae39f2788 updates to the imagesequencing & renderableplanet projection classes mainly 2015-03-24 12:31:03 -04:00
Alexander Bock e6abdd97d2 Ability to request an OpenGL version from SGCT using commandline arguments 2015-03-03 14:53:35 +01:00
Alexander Bock c546b1e1be Updated the OpenSpace version 2015-02-27 15:46:24 +01:00
Alexander Bock 3155073f05 More changes to allow JupiterProjection and PlutoProjection in the same scene
Add a switch that allows Renderables to react to big changes in time (via openspace.time.setTime)
Allow the setting of the minimum pixel size of stars
2015-02-24 19:16:15 +01:00
Alexander Bock bac0a9ad31 Disable the swap barrier before the scene load (and reactivating it afterwards) 2015-02-24 19:13:50 +01:00
Alexander Bock 84f8ce961b Added configuration switch "DisableRenderingOnMaster" to disable rendering on the master node 2015-02-24 13:42:47 +01:00
Alexander Bock d1a215e5c3 Use correct versioning scheme 2015-02-24 11:09:40 +01:00
Alexander Bock fb2c99b5ed Removed cppcheck warnings
Removed unused Interface file
2015-02-23 19:08:15 +01:00
Alexander Bock 3bf577d04d Add OpenSpace version information
Make info text in WaveFrontGeometry more useful
2015-02-23 17:14:01 +01:00
Joakim Kilby a26214a38d Added boolean to OpenSpaceEngine declaring if this node is the master or not.
made sure it's set in the right place in main file.
removed all references to sgct::engine::instance()->isMaster() and replaced with calls to openspaceengine isMaster() function.
2015-02-20 10:45:33 +01:00
Alexander Bock 9bad48ae2e Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz 2015-02-19 16:24:01 +01:00
Alexander Bock f00158969c Cleanup of ImageSequencer
Added caching to playbook loading
Increased performance of playbook loading
Added default placeholder image
2015-02-19 16:21:28 +01:00
Joakim Kilby dce4835bab changing render function of openspaceengine and renderengine to take glm::mat4 matrices for Projection / ViewMatrix. 2015-02-19 15:19:20 +01: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
Joakim Kilby 86ab940b56 uncommented the advance time line 2015-02-18 09:27:18 +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 8e4cb00e5e Merge remote-tracking branch 'origin/develop' into features/imgui 2015-02-17 15:11:49 +01:00
Alexander Bock 97d97a8a16 Merge branch 'develop' into features/imgui 2015-02-17 15:11:25 +01:00
Joakim Kilby 7c7b4f1f97 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome 2015-02-17 14:41:02 +01:00