Commit Graph

433 Commits

Author SHA1 Message Date
Jonas Strandstedt ea3c5e8d11 More cleanup 2014-10-24 13:34:03 +02:00
Jonas Strandstedt ed3063ab86 Continue fixing warnings 2014-10-24 11:18:36 +02:00
jonasstrandstedt 1bf256db5a Fix warnings 2014-10-24 08:46:31 +02:00
Jonas Strandstedt 5225323a2b Cleaning up OpenSpaceEngine and RenderEngine 2014-10-23 18:13:40 +02: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 8b8fd08cbb Merge branch 'bug/abuffershadersupdater' into develop 2014-10-21 16:04:11 +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
jonasstrandstedt 3f72adc854 Added copy/paste for Linux
- Requires xclip installed (otherwise nothing happens)
2014-10-20 22:13:59 +02: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
Jonas Strandstedt 13bdd33f7e Disable cotire in case it breaks on Linux 2014-10-16 15:52:37 +02:00
Jonas Strandstedt 572651dba7 Added cotire to speed up compilation 2014-10-16 15:38:59 +02:00
Jonas Strandstedt d32978a9f7 RenderEngine fix for Fisheye rendering 2014-10-13 10:32:42 +02:00
Alexander Bock b50a11297c Started cleanup of OpenSpaceEngine 2014-10-12 17:58:39 +02:00
Alexander Bock 5396663848 Fix Jenkins compile error 2014-10-11 18:36:36 +02:00
Alexander Bock dfc085ec6f Fix Jenkins compile error 2014-10-11 18:29:36 +02:00
Alexander Bock f5e0639d4f Merge branch 'solarsystem2' into develop 2014-10-11 18:17:26 +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
Alexander Bock ae9ded0261 Cleanup of SceneGraphNode 2014-10-11 01:12:37 +02:00
Alexander Bock f2687aba78 Removed warning from KameleonWrapper
Updated Ghoul version
2014-10-10 17:02:26 +02: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 ea26e11d8b changes to renderable path only, small change in interaction handler.. 2014-10-08 20:31:28 -04:00
michal 3464ef46f3 openspace-data 2014-10-08 16:28:11 -04: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 e89bfb5161 Fixed Ephimeris rendering to use PSC correctly 2014-10-08 15:54:09 +02:00
Jonas Strandstedt eca6863450 Merge branch 'feature/camera' into solarsystem2 2014-10-08 14:36:48 +02:00
Jonas Strandstedt 5fcf9f0c6e Merge branch 'develop' into solarsystem2
Conflicts:
	src/util/spicemanager.cpp
2014-10-08 14:36:28 +02:00
Jonas Strandstedt 48614f582a Fixed blending for stars default framebuffer rendering 2014-10-08 13:43:43 +02:00
Alexander Bock 98d6e7138a Second try to fix the camera 2014-10-08 10:30:50 +02:00
michal 36925cbde7 Finished ephemeries for all 8 planets and fixed so that renderablewavefront object.
NOTE: Basically, added a whole bunch of mod files, I agre - its ugly but later we need to decide ownership of this class.

Ephemeries goes temporarily under the name "RenderableTrail"
It displays a fading ephemeries with nodes of equal time (planetary days for now, will make changable)
For each modfile one specifies all the usual spice stuff with the addition of:
 - Planets tropical orbit
 - Planet/Earth orbit ratio
 - Planets day length in earth hours
Pulled from NASAs webpage so its reliant data, got the link from Brian.
2014-10-07 23:06:21 -04:00
michal 262767ac4f Merge branch 'solarsystem2' of openspace.itn.liu.se:/openspace into solarsystem2 2014-10-07 18:48:37 -04:00
michal 21745b91a5 new class - renderabletrail - will later be renamed and current replace renderableephemeris.
Right now just adding a bunch of mod files, i know this is rather ugly but i just need it to work for friday.
2014-10-07 18:44:14 -04:00
Alexander Bock 24e1d8f176 Unhack temporary limitation of camera to horizontal movements 2014-10-07 23:25:46 +02:00
Alexander Bock fdd0efccfc Fix OpenSpaceTest 2014-10-07 22:27:06 +02:00
Alexander Bock 4bbe60637d Finished cleanup of SpiceManager 2014-10-07 21:45:24 +02:00
Alexander Bock 5763c54a49 Added error reporting function to SpiceManager
Started cleaning up codebase
2014-10-07 02:22:19 +02:00