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
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
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
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
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
Alexander Bock
67f0fb3c08
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
include/openspace/util/spicemanager.h
shaders/star_fs.glsl
src/engine/openspaceengine.cpp
src/rendering/renderengine.cpp
src/rendering/stars/renderablestars.cpp
src/scenegraph/scenegraph.cpp
src/scenegraph/scenegraphnode.cpp
2014-10-06 22:22:30 +02:00
michal
acc8056455
added some new classes for ephemeris rendering..
2014-10-06 15:30:13 -04:00
Alexander Bock
32c2c499fa
Fix SpiceManager test
2014-10-06 01:43:33 +02:00
Alexander Bock
f7af8256dd
Finished cleaning the SpiceManager
2014-10-06 01:33:56 +02:00
Alexander Bock
b7da50b3dd
Added Lua method to print a screenshot
2014-10-05 17:31:47 +02:00
michal
9eaf25f38c
still working on obj loader, trying to maintain regular pushes to git.
2014-10-03 22:35:17 -04:00
michal
d2c13eb104
adding objloader
2014-10-03 18:57:01 -04:00
michal
59161e186c
Renderableehpemeris still as it is, will be repurposed though.
...
Renderable trail now acts like planet ephemeris, not yet finished. Need to work on objectloader
2014-10-03 18:56:16 -04:00
Jonas Strandstedt
3cad506b5b
PowerScaling modifications
...
- Started working on PowerScaling with some initial changes
- Faking the stars by blending with the abuffer
- Changed texture filtering for planets, looks better in my opinion
2014-10-03 17:02:31 +02:00
michal
938c442dd6
got renderable ephemeris working for larger deltas, problems with leap years though
2014-10-02 11:00:43 -04:00
Jonas Strandstedt
e4a8e87098
Using new ghoul ProgramObject functionality
...
- Fixed risk of memory leak in SceneGraph (deleting shaders)
2014-10-01 15:30:39 +02:00
Jonas Strandstedt
cc3f9ef34b
Fixed ABuffer to update shader when Scengraph is updated
2014-09-29 13:03:58 +02:00
Alexander Bock
e97d5f17bc
More SpiceManager cleanup
2014-09-28 16:13:26 +02:00
Alexander Bock
83e7398fee
GCC fixes, fixed unit tests
2014-09-28 03:03:24 +02:00
Alexander Bock
e6ab0f51fc
Started cleanup of SpiceManager
2014-09-28 02:28:14 +02:00
Alexander Bock
b667a4910c
Reworked how SPICE kernels are loaded
...
- SpiceEphemeris can provide a list of kernels that are loaded when created
- Time and Leapsecond kernels are provided in the openspace.cfg file
2014-09-28 00:06:53 +02:00
Alexander Bock
1b3823d88c
Remove old Spice wrapper
2014-09-27 21:46:24 +02:00
Alexander Bock
cfcf0247be
More cleanup of ConfigurationManager
2014-09-27 19:13:36 +02:00
Alexander Bock
add7e06a64
Cleaning up ConfigurationManager
2014-09-27 18:54:10 +02:00
Alexander Bock
dd15c4e3d0
Make the subcomponents not pointers in the first place
2014-09-27 18:41:03 +02:00
Alexander Bock
72aac7b240
Refactoring OpenSpaceEngine pointers into unique_ptr
...
Compile fix for GCC
2014-09-27 18:15:03 +02:00
Alexander Bock
0570bffb68
Cleanup of OpenSpaceEngine by factoring out ConfigurationManager class
2014-09-27 18:04:43 +02:00
Alexander Bock
bedc894064
Removing Jenkins warnings
2014-09-26 17:53:18 +02:00
Jonas Strandstedt
742b1016d4
Added logmanager in openspacengine.h
2014-09-26 17:33:39 +02:00
Jonas Strandstedt
5427dbdeb2
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
src/rendering/planets/renderableplanet.cpp
src/rendering/renderablefieldlines.cpp
src/rendering/renderablevolumegl.cpp
src/rendering/stars/renderablestars.cpp
2014-09-26 17:17:18 +02:00
Jonas Strandstedt
2d359fd48c
Started working on modularizing PSC and ABuffer
2014-09-26 17:03:59 +02:00
Alexander Bock
7359adf400
Replaced RuntimeData with separate, temporary structs that are passed around
2014-09-26 13:29:01 +02:00
Alexander Bock
b3e800acaa
Comment out flare code
2014-09-26 13:24:09 +02:00
Alexander Bock
d7190b2239
Allow Lua scripts to reload scenegraph file
2014-09-26 01:02:13 +02:00
Alexander Bock
11ecb32801
Fix crash when PropertyOwner's are deallocated
2014-09-26 01:01:00 +02:00
Alexander Bock
dbd13b3310
Replace hard-coded constant with constant definition
2014-09-26 01:00:15 +02:00
