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
Alexander Bock
a6ebddb8eb
Updated copyright header in all files
2015-02-17 14:20:03 +01:00
Joakim Kilby
7764553a35
fixing bugs caused by merge
2015-02-17 13:30:45 +01:00
Joakim Kilby
f096d9d9e3
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome
...
Conflicts:
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/interaction/luaconsole.cpp
src/rendering/renderengine.cpp
2015-02-17 12:18:14 +01:00
Joakim Kilby
0f9476519c
changed into average delta time instaed of delta time,
...
added calls to pre/pro sync and serialize/deserialize of scriptengine and time
2015-02-17 11:59:52 +01:00
Alexander Bock
862bfd6947
Making most includes in openspaceengine into forward declarations
2015-02-17 10:36:18 +01:00
Joakim Kilby
79d8bb40c5
added preSynchronization call to renderEngine in openspace engine.
...
added call to updateCamera for current focus node. (Note that this causes master to be 1 frame ahead of slaves and should be changed)
2015-02-17 08:21:49 +01:00
Alexander Bock
86b754f313
Clean up of LuaConsole class
2015-02-15 17:56:07 +01:00
Alexander Bock
c57285c34f
Fix of RenderableTrail
2015-02-14 10:52:17 +01:00
Alexander Bock
2e11d247d2
Remove a crash where ScriptManager was deinitialized wrongly
2015-02-14 10:41:54 +01:00
