Commit Graph

445 Commits

Author SHA1 Message Date
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
michal
96853d579b added changes to make things work on my end 2014-10-06 18:48:47 -04: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
bae710d245 small gitignore 2014-10-06 15:31:06 -04:00
michal
acc8056455 added some new classes for ephemeris rendering.. 2014-10-06 15:30:13 -04:00
Alexander Bock
62e0844671 Add ABuffer/constants.hglsl to the ignore list 2014-10-06 13:44:21 +02: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
jonasstrandstedt
795d02b9aa Fixed delete of unallocated memory 2014-10-03 21:21:21 +02: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
e0d100c13a GCC compile fix 2014-09-27 22:00:25 +02:00
Alexander Bock
1b3823d88c Remove old Spice wrapper 2014-09-27 21:46:24 +02:00
Alexander Bock
3a2c4e92fc Remove the paths from the configuration dictionary to make it unnecessary to keep them synchronized with the filesystem 2014-09-27 19:42:25 +02:00
Alexander Bock
f3fb8cd95e Apply getValueSafe/getValue change of Dictionary to the codebase 2014-09-27 19:23: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
b343f4e552 GCC compile fixes 2014-09-27 15:33:16 +02:00
Alexander Bock
4d756daaf6 Simplified error handling in Lua API 2014-09-27 15:25:35 +02:00
michal
b331bdba9b changes to openspacedata 2014-09-26 18:33:48 -04:00
michal
64135dbed4 made it working so possible to continue 2014-09-26 18:33:28 -04:00
michal
367b49c8ac Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-09-26 17:42:24 -04:00
michal
22fd3acc59 small changes to to get everything working on my end / michal 2014-09-26 17:42:07 -04:00
Alexander Bock
1ca2bfd6c9 Remove more warnings 2014-09-26 18:19:28 +02:00
Alexander Bock
41895d5a63 Updated to new ghoul version 2014-09-26 18:05:26 +02:00
Alexander Bock
bedc894064 Removing Jenkins warnings 2014-09-26 17:53:18 +02:00