Jonas Strandstedt
4bb9d8c800
Merge branch 'solarsystem2' into cleanup
...
Conflicts:
src/util/factorymanager.cpp
2014-10-27 19:03:36 +01:00
Jonas Strandstedt
20137613a8
Fixed Visual Studio assert error
...
- Visual studio optimized away the assert expression causing the getvalue
statement not to be called
2014-10-27 18:01:46 +01:00
Jonas Strandstedt
5daa77f7b2
Fixed Release build for windows
...
- Release build is booting but something goes wrong with spice
2014-10-27 15:22:14 +01:00
michal
51c8034fe9
boresight works.
2014-10-24 21:45:49 -04:00
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
michal
d3ea503454
Fixes to the modelloader class
2014-10-23 20:11:49 -04:00
michal
1e3a7a72f1
openspace-data
2014-10-23 18:49:54 -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
michal
2dab6e41d5
begin merge with develop
2014-10-23 11:37:22 -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
michal
5ece54cdc0
openspace-data issue in sourcetree, pushing
2014-10-22 16:09:05 -04:00
michal
3a8b2ac4a2
smallchanges
2014-10-22 15:19:15 -04: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
michal
bd802c261f
ghoul submodule stuff
2014-10-21 13:44:44 -04:00
michal
64ee84ede1
Fixed model oriantation
...
After 32 maya exports and about 600 different attempts of different rotations / scalings along each axis
I realised that the model is in fact correctly aligned and that what we are seing are precisional errors with the
stupid boresight-polygon-baton.
Nevertheless, out of all of those Im keeping some of the more cruicial test-objects (8 to be precise) for future reference,
these can be deleted at some point, I just really want to keep them for now, comfort blanket.
2014-10-21 12:49:39 -04: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
michal
d098a37ea7
openspace-data for pluto artefact commit
2014-10-20 18:30:21 -04:00
michal
54809c6376
Pluto geometry artefacts commit.
2014-10-20 18:29:55 -04:00
jonasstrandstedt
3f72adc854
Added copy/paste for Linux
...
- Requires xclip installed (otherwise nothing happens)
2014-10-20 22:13:59 +02:00
michal
4a6e9dd671
forgot to add openspace-data. fix.
2014-10-20 16:01:04 -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
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
michal
97df29706c
small changes, return solarsystem to original state
2014-10-15 18:42:14 -04:00
michal
e31a93f21f
Merge branch 'solarsystem2' of openspace.itn.liu.se:/openspace into solarsystem2
2014-10-15 15:43:13 -04:00
michal
ae48d76c60
merged openspace-data and reset time parameters to around jupiters little red dot observation (we want to focus on that for now)
2014-10-15 15:42:56 -04: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
8884f4cc36
Started initial performance testing on Lua-based keyboard controller
2014-10-13 17:24:11 +02:00
Jonas Strandstedt
d32978a9f7
RenderEngine fix for Fisheye rendering
2014-10-13 10:32:42 +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
b50a11297c
Started cleanup of OpenSpaceEngine
2014-10-12 17:58:39 +02:00
