Alexander Bock
e630f6efbb
Fixed bug that did not set cache directory correctly
...
Moved visibility of console into LuaConsole class
2014-11-18 17:47:09 +01:00
Alexander Bock
f02234099f
Added code that checks for completeness (as defined in configurationmanager.cpp) of the configuration file
2014-11-18 17:17:56 +01:00
Alexander Bock
a0503ba957
Modularizing font specification
2014-11-18 16:21:52 +01:00
Alexander Bock
6b40cb18fb
Merge branch 'feature/interactionhandler' into develop
...
Conflicts:
include/openspace/engine/openspaceengine.h
include/openspace/interaction/interactionhandler.h
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
2014-11-18 15:46:26 +01:00
Jonas Strandstedt
31c76f3e3c
Added key binding from Lua possible
...
- Possible to add key bindings from Lua possible. This calls Lua scripts
from key commands.
- Temporary fixed a small bug for volume rendering
2014-11-17 17:02:40 +01:00
Jonas Strandstedt
8d2503b68e
Added support for pixelData for ABuffer
...
- ABufferFixed should work but it doesn't. But the interface works at
least.
- ABufferFixed works for normal rendering
- Removed position for ABuffer, it should make rendering much faster.
Todo:
- Figure out why the fetching of pixelData for ABufferFixed gives wrong
result.
2014-11-13 15:41:10 +01:00
Jonas Strandstedt
ba7a4a4a47
Added ABuffer visualizer
...
- First draft of the ABuffer visualizer renders a cube with all fragments
from the single linked abuffer. Lua command to turn on is
openspace.visualizeABuffer(true)
- Fixed LuaConsole to stop receiving input command after inputing command
- Fixed LuaConsole not to add command to history if it is identical to the
most recent command.
TODO:
- Add support for dynamic and fixed abuffer
- Scale the cube to match the window ratio
2014-11-12 16:54:40 +01:00
Jonas Strandstedt
46959b4801
Cleanup for KameleonWrapper
...
- Fixed so size and scale for RenderableVolumeGL can be deduced from model.
2014-11-11 13:43:38 +01:00
Jonas Strandstedt
7e1396a8ae
Added separete ProgressBar class
2014-11-07 14:48:03 +01:00
Jonas Strandstedt
3a2754fac7
Added support for more volume types
...
TODO:
- Test new type of volumes
2014-11-06 16:03:08 +01:00
Jonas Strandstedt
f85e18dc18
OS X now doesn't crash for volumes
...
- Fixed a few warnings
2014-11-05 17:11:27 +01:00
Jonas Strandstedt
15db56ff33
Removed unused file
2014-10-27 19:10:09 +01:00
Jonas Strandstedt
4bb9d8c800
Merge branch 'solarsystem2' into cleanup
...
Conflicts:
src/util/factorymanager.cpp
2014-10-27 19:03:36 +01:00
Jonas Strandstedt
ea3c5e8d11
More cleanup
2014-10-24 13:34:03 +02:00
michal
d3ea503454
Fixes to the modelloader class
2014-10-23 20:11:49 -04:00
michal
ecfc4ad79a
reshaping the modelloader class to suit the overall design of openspace
2014-10-23 18:49:15 -04:00
Jonas Strandstedt
5225323a2b
Cleaning up OpenSpaceEngine and RenderEngine
2014-10-23 18:13:40 +02:00
michal
08a97d9e68
Merge branch 'develop' into solarsystem2
...
Conflicts:
scripts/default_startup.lua
src/rendering/renderablewavefrontobject.cpp
2014-10-23 11:45:24 -04:00
Jonas Strandstedt
9b1c993e89
Removed SGCT include from openspaceengine.h
2014-10-23 16:08:10 +02:00
Jonas Strandstedt
3ee8f85c14
Removed Flare
2014-10-23 15:35:55 +02:00
Jonas Strandstedt
5e410c6816
Removed unused files
2014-10-23 14:35:04 +02:00
Jonas Strandstedt
a7da4d84cc
Added SyncBuffer class
...
- Added SyncBuffer class for easy and effecient synchronization
- Small changes to Camera class
- Forward declared a few classes to minimize dependencies
2014-10-22 16:37:54 +02:00
Jonas Strandstedt
a8f3923659
Moved the lua command input to separete class
...
- Added functionality for keeping the input history
2014-10-22 13:04:55 +02:00
jonasstrandstedt
490fbc4869
Linux fix
2014-10-21 21:44:29 +02:00
Jonas Strandstedt
0e52e759db
Improved interaction for distance and origin
2014-10-21 17:04:58 +02:00
Jonas Strandstedt
db141e8e86
Merge branch 'develop' into bug/abuffershadersupdater
...
Conflicts:
ext/ghoul
openspace.cfg
src/abuffer/abuffer.cpp
src/engine/openspaceengine.cpp
src/rendering/renderengine.cpp
2014-10-21 14:54:48 +02:00
michal
54809c6376
Pluto geometry artefacts commit.
2014-10-20 18:29:55 -04:00
michal
50b4c1ec36
fixed renderabletrail class to suit for all different delta times, tropical orbits etc etc. lot of stuff to do with precision and set time intervals (pain in the ass). works clockwork.
...
changes to modules etc. will do more fixes soon. Incoming.
2014-10-20 16:00:38 -04:00
Jonas Strandstedt
5cd90db239
Added seconds version of the command input
...
- Using unix terminal style input history
- ctrl+c support to copy current command to clipboard
- ctrl+v support to paste current text from clipboard
2014-10-20 17:12:53 +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
Jonas Strandstedt
7ef5295bb7
Added ABuffer reinitialization
...
- Fixed so ABuffer reinitializes properly (could probably be optimized by
not resizing of smaller than before)
- Now setting size properly from window dimensions
- SGCT side-by-side stereo working
2014-10-17 14:50:40 +02:00
Jonas Strandstedt
18a87ef99e
Added ScreenLog
...
- Added first version of a ScreenLog mechanism
- Moved the info box to the upper left corner
- Added Ubuntu fonts
- Made RenderEngine a PropertyOwner with _showInfo and _showScreenLog as
bool properties that can be edited through Lua.
2014-10-17 12:20:23 +02:00
michal
099bcc2c9b
changing renderabletrail class to work for planetocentric
2014-10-16 16:13:54 -04:00
Jonas Strandstedt
572651dba7
Added cotire to speed up compilation
2014-10-16 15:38:59 +02:00
Alexander Bock
86efb3573b
More work in preparing for lua-based keyboard controller
...
Modified ScriptManager to decouple adding libraries from registering libraries
Allowing ScriptManager to register libraries to other lua states as well
2014-10-14 00:08:26 +02:00
Alexander Bock
0518e8cf02
Added fixed key mapping to KeyboardControl fixed
...
Cleanup of code
2014-10-13 10:29:04 +02:00
Alexander Bock
c41b1b178a
Added missing commit
2014-10-13 00:43:36 +02:00
Alexander Bock
ff62c06320
Installed new InteractionHandler
2014-10-13 00:39:46 +02:00
Alexander Bock
d62e6296aa
More work on converting the old InteractionHandler to new methods
2014-10-13 00:27:20 +02:00
Alexander Bock
d67c9ffe8d
Started changes for InteractionManager
2014-10-12 23:51:33 +02:00
Alexander Bock
befcc59bcd
Load common module automatically without the need to declare it in the scenefile
...
Drastically remove the amount of false-positive errors during runtime
2014-10-11 14:45:34 +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
Alexander Bock
0e46642624
Merge branch 'develop' into solarsystem2
...
Conflicts:
src/util/factorymanager.cpp
2014-10-11 10:54:52 +02:00
michal
3bb9912356
latest changes involve adding an unfinished class called "renderable fov"- ignore that one.
...
The rest is pretty straight forward, renderable trail is the ephemeris class and wavefrontobject is a very crudely constructed reader... ill fix that on monday
2014-10-11 01:43:31 -04:00
Jonas Strandstedt
60043c000e
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2014-10-10 15:20:22 +02:00
Jonas Strandstedt
9adc1e69fa
Added RenderablePlane
...
- Only first version of the RenderablePlane
Todo:
- Support rotation of planes
- Support billboarding
- Support different local origin (LowerLeft, LowerRight, Center...)
2014-10-10 15:18:16 +02:00
Jonas Strandstedt
9a1b59a73e
Intermediate commit
2014-10-10 11:29:16 +02:00
michal
d3f66c4a7c
Merge branch 'solarsystem2' of openspace.itn.liu.se:/openspace into solarsystem2
...
Conflicts:
src/util/spicemanager.cpp
2014-10-08 16:27:51 -04:00
michal
1ed4b74d3e
added renderablepath and made changes to renderabletrail
2014-10-08 16:15:37 -04:00
Jonas Strandstedt
eca6863450
Merge branch 'feature/camera' into solarsystem2
2014-10-08 14:36:48 +02:00
