Joakim Kilby
eb7fefb3c9
fixed Alex' bug!!
...
Added string specialization to template functions for syncbuffer class
2015-02-17 17:51:53 +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
5b3742961e
added function for getting un-synchronized position of the camera (only meant to be used on master for calculation of camera matrix and position)
2015-02-17 13:29:45 +01:00
Joakim Kilby
aa66bdeaa4
added synced versions of shared variables and modified set/get methods to adress the right versions of variables
2015-02-17 11:58:57 +01:00
Joakim Kilby
1cfabe6a2d
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
2015-02-17 08:25:09 +01:00
Joakim Kilby
52e51b76bf
added initializedata struct
...
It is so far empty but will be used later on for initialization
2015-02-17 08:19:07 +01:00
Alexander Bock
69e0213e79
Added ability to disable shading for RenderablePlanet renderables
2015-02-16 19:23:23 +01:00
Joakim Kilby
a3ff828e91
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
...
Conflicts:
src/engine/openspaceengine.cpp
2015-02-16 08:33:01 +01:00
Alexander Bock
55f7b0fc03
Move 'keys' file from interaction to util
2015-02-15 17:55:44 +01:00
Joakim Kilby
c6b358488b
changed sync variables for camera and time classes.
...
added a boolean _timeJumped which is synced and set to true whenever setTime is called.
(Note this is never set to false afterwards unless a call is made to setTimeJumped( bool ) with value false)
2015-02-13 11:02:35 +01:00
Joakim Kilby
2b83c19baa
commit to be able to merge
2015-02-12 14:58:40 +01:00
Joakim Kilby
a8abfa74bd
Added proper synchronization for mouse controller and camera.
...
Camera class now contains three instances of synched variables. a local copy changed on master. a shared copy only used for sharing in serialize/deserialize. and finally a synched copy never written to except in post sync
2015-02-10 11:34:12 +01:00
Joakim Kilby
47ed14b8d6
Added serialize / deserialize functions for camera.
...
Added proper mutex protected shared versions of synced variables for camera class.
Added a post sync function for camera class (and a call to it in render engine post sync function)
2015-02-09 14:50:56 +01:00
jonasstrandstedt
6b164f0b36
Added camera offset support
2015-01-06 12:43:16 +01:00
Jonas Strandstedt
bf0a8291d6
Updated to the most recent Ghoul
...
- Using new VertexBufferObject in PowerScaledSphere as a test case.
2014-12-15 17:10:43 +01:00
Jonas Strandstedt
da4fa44c03
Continued work on memory leaks and proper isReady usage
2014-12-11 16:48:49 +01:00
jonasstrandstedt
81caf96d72
Started working on Renderables
...
- Making sure isReady is properly set
- Making sure initialization is done correctly
- Making sure deinitialization is done correctly
2014-12-10 19:43:38 +01:00
Alexander Bock
7226b23cc0
Fixing doxygen warnings
2014-12-09 19:11:49 +01:00
Alexander Bock
90eac194dc
Initial work on performance measuring
2014-12-09 01:41:42 +01:00
Alexander Bock
2c85d53164
Made GUI optional
2014-12-06 18:33:11 +01:00
Alexander Bock
4e4de3f40e
Changing the hardcoded bv-color map to a transfer function based map
2014-12-05 22:58:14 +01:00
Alexander Bock
d9fbf7c5fd
Adding capabilities to configure the LogLevel and ImmediateFlush of the LogManager
2014-12-05 16:43:54 +01:00
Alexander Bock
f1659e5c8b
Minor workover of the logging creating facility
2014-12-03 15:42:35 +01:00
Alexander Bock
0dc2a9d030
Allow the configuration file to request logging functionality
2014-12-03 00:39:42 +01:00
Alexander Bock
b05c4cf30f
Add capabilities to write out documentation of all Lua functions on startup
2014-11-29 14:03:49 +01:00
Alexander Bock
fc1dcfabc8
Some more changes to the RenderableStars class
2014-11-26 16:36:02 +01:00
Alexander Bock
b4f6070642
Started cleanup of RenderableStars class
2014-11-25 19:15:59 +01:00
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
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
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
ecfc4ad79a
reshaping the modelloader class to suit the overall design of openspace
2014-10-23 18:49:15 -04: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
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
michal
54809c6376
Pluto geometry artefacts commit.
2014-10-20 18:29:55 -04: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
572651dba7
Added cotire to speed up compilation
2014-10-16 15:38:59 +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
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
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
Jonas Strandstedt
5fcf9f0c6e
Merge branch 'develop' into solarsystem2
...
Conflicts:
src/util/spicemanager.cpp
2014-10-08 14:36:28 +02:00
Alexander Bock
98d6e7138a
Second try to fix the camera
2014-10-08 10:30:50 +02:00
