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
Alexander Bock
e6abdd97d2
Ability to request an OpenGL version from SGCT using commandline arguments
2015-03-03 14:53:35 +01:00
Alexander Bock
862c8ffd96
Renamed globalOpacity to globalblackout
...
Start application in blackout and fade in after scenegraph has been loaded
2015-02-25 09:37:55 +01:00
Alexander Bock
47d6fe3141
Fix merging issues
2015-02-24 21:31:39 +01:00
Alexander Bock
02be52e8c7
OpenGL 4.3 -> OpenGL 4.2
2015-02-24 10:03:32 +01:00
Joakim Kilby
ea2017e11c
Introduced fadeIn and fadeOut functionality via scripting.
2015-02-20 16:54:30 +01:00
Joakim Kilby
468bb98e46
created postFX functions in main and added a postFX pass to sgct engine to allow for a global fade after executing certain scripts.
...
added global opacity member variable with set/get methods in render engine.
added two VERY simple shaders used in the post FX pass. Note these are not handled in openspace so updating files does not update shader
2015-02-20 11:19:50 +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
Joakim Kilby
bfb0531090
minor adjustement to mainLogCallback function. just ensuring that the argument to substr is never negative
2015-02-19 18:51:07 +01:00
Joakim Kilby
23681cba2d
updated files to new SGCT (version 2.5.0)
...
Ask Alex for a distribution of new SGCT
2015-02-19 18:47:16 +01:00
Joakim Kilby
e35736bd4d
ensured master does not care about scene orientation (to make navigation on master easier )
2015-02-19 17:34:13 +01:00
Joakim Kilby
26595edc90
updates to matrix calculations
2015-02-19 15:40:08 +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
Alexander Bock
a6ebddb8eb
Updated copyright header in all files
2015-02-17 14:20:03 +01:00
Alexander Bock
862bfd6947
Making most includes in openspaceengine into forward declarations
2015-02-17 10:36:18 +01:00
Alexander Bock
b2cb6fb584
Change some more code in preparation of the new SGCT version
2014-12-04 16:28:49 +01:00
Jonas Strandstedt
5225323a2b
Cleaning up OpenSpaceEngine and RenderEngine
2014-10-23 18:13:40 +02:00
Jonas Strandstedt
dbef0d36e4
Initial command input support
...
- Access the command input prompt with the § button on swedish keyboard
layout. It is whatever key is corresponding to SGCT_KEY_BACKSLASH on
other layouts.
2014-10-20 15:58:37 +02:00
Alexander Bock
c226e9b82f
Cleaned up code
...
Added new COMMON_FOLDER setting in scene file
Error handling when spice kernels are not available
2014-10-11 13:40:52 +02:00
jonasstrandstedt
795d02b9aa
Fixed delete of unallocated memory
2014-10-03 21:21:21 +02:00
Jonas Strandstedt
82ff7fa984
Merge branch 'develop' into stars
...
Conflicts:
include/openspace/util/constants.h
shaders/pscstandard_fs.glsl
shaders/pscstandard_vs.glsl
src/interaction/interactionhandler.cpp
src/main.cpp
src/rendering/renderengine.cpp
src/scenegraph/scenegraph.cpp
src/scenegraph/scenegraphnode.cpp
src/util/factorymanager.cpp
2014-09-24 15:39:22 +02:00
Alexander Bock
8ec9bc6705
Cleaned up main.cpp
...
Added functionality to send Lua scripts over the network
2014-09-17 01:10:52 +02:00
Alexander Bock
03e25f69d5
Update post-receive hook
2014-09-15 18:52:43 +02:00
Alexander Bock
8e1135cf27
Update post-receive hook
2014-09-15 18:32:22 +02:00
Alexander Bock
954b2d07e9
A change to check the build system
2014-09-15 18:31:27 +02:00
Alexander Bock
c7c7fa4413
Fix the build again
2014-09-15 18:02:57 +02:00
Alexander Bock
7f8b7950af
Deliberately break to check email from Jenkins
2014-09-15 17:59:06 +02:00
Alexander Bock
954dbdce13
Merge branch 'origin/feature/ABuffer' into properties
2014-09-13 10:59:33 +02:00
Alexander Bock
e13eafdbde
Added more comments to main.cpp
2014-09-13 10:33:16 +02:00
michal
013d4c5bb6
WIP: intermediary commit, will attempt to run HC's code on this machine.
2014-08-25 17:37:23 -04:00
michal
d75171c69b
Added new class renderablestars.cpp for rendering starfields.
...
As for now only reads and stores *.speck file data.
TODO:
1. write cache mechaninsm (load avg ~15 sec)
2. fix render function.
3. add textures.
2014-08-20 11:29:31 -04:00
Alexander Bock
3a0d15c933
Make use of CommandlineParser to parse configuration file for OpenSpaceEngine; make error handing of SPICE code more reliable
2014-08-20 15:57:50 +02:00
Jonas Strandstedt
6419f34b5a
ABuffer working with small issues
...
- Pointing to bugfixed Ghoul
- Pointing to Ghoul with Linux file callback
- Fixed interaction distance control bug when moving to close
- Distance control with mouse wheel added
- Kameleonwrapper normalization based on histogram
- ABuffer seems to work with small issues
2014-06-18 10:34:40 -04:00
Alexander Bock
7f7e25fd8b
More work on ephemerides
2014-05-04 16:50:20 +02:00
Alexander Bock
982ec8b87c
Restructured SceneGraphNode code
2014-05-04 15:28:07 +02:00
Hans-Christian Helltegen
b259c64655
Merge work and bugfixes
2014-04-14 11:40:53 -04:00
Hans-Christian Helltegen
909350faaa
Develop merge
2014-04-11 15:45:53 -04:00
Jonas Strandstedt
2599268fd3
Merge branch 'develop' into OpenCLWrapper
...
Conflicts:
ext/ghoul
src/engine/openspaceengine.cpp
2014-04-07 14:38:21 -04:00
Hans-Christian Helltegen
4985feb309
Improved the interface. Added recursive traversal of the property. The interface is now created in main.cpp and owns a pointer to the openspacenengine so that the callback chain is GUI -> Interface -> Engine
2014-04-04 16:13:08 -04:00
Jonas Strandstedt
5963920953
Added support for configuration file
...
- BASE_PATH is set using the openspace.cfg file. The binary will look
upwards in the directory hierarchy until it is found.
- All other paths is defined in the configurationfile. Paths may be
absolute or relative using the ${BASE_PATH} token
- Moved SGCT configuration files to its own folder
- Updated tests to support new configuration loading
- TODO: Make the loading of configuration easier for the programmer.
2014-04-04 11:00:25 -04:00
Hans-Christian Helltegen
81af618a3f
Started work on an interface for external GUI. GUI sends json objects as strings which are parsed into a boost::property_tree
2014-04-03 17:00:57 -04:00
Hans-Christian Helltegen
146044045c
Fixed syncing issue
2014-03-20 12:43:27 -04:00
Hans-Christian Helltegen
658ae13d96
Added flare to OpenSpace
2014-03-19 16:41:12 -04:00
Jonas Strandstedt
89eeae62d0
Restructuring for OpenSpace tests
...
- Moved all OpenSpace headers to separate include directory
- Added OpenSpaceTests binary with OPENSPACE_HAVE_TESTS define
- Added CMake setting of BASE_DIR
- Added OpenSpace initial tests for SceneGraph and SceneGraphNodes
- Added OpenSpace initial tests for psc and pss
- Restructured OpenSpace so no GL functions are called in constructors
to make the classes testable
- Todo: Make the base dir possible to set through command line argument
and configuration file
2014-03-19 14:57:10 -04:00
Alexander Bock
1f645bc977
Cleaned up source files
...
added tinythread library (for SGCT)
Updated Ghoul version
2014-02-11 09:20:01 +01:00
Alexander Bock
7a4983f2c9
adapt to new Ghoul version (p vs absPath macro)
...
added configurationmanager script
2014-01-16 14:56:50 +01:00
Alexander Bock
006bd56ae6
General changes
...
added OpenSpaceEngine
added ConfigurationManager
added query functions
removed GLEW-related Windows warning
added old external control classes
more restructuring
2014-01-09 19:19:01 +01:00
Alexander Bock
ecd539ddf4
restructuring code
2014-01-08 11:56:18 +01:00
Alexander Bock
e1174cc5d5
enable switching between focus nodes
2014-01-08 09:53:05 +01:00
Alexander Bock
7126ae4b8d
compile fixes in x64 builds
...
moved Lua dependency to Ghoul
2014-01-07 11:56:33 +01:00