Commit Graph

43 Commits

Author SHA1 Message Date
Alexander Bock
8884f4cc36 Started initial performance testing on Lua-based keyboard controller 2014-10-13 17:24:11 +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
d67c9ffe8d Started changes for InteractionManager 2014-10-12 23:51:33 +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
ea26e11d8b changes to renderable path only, small change in interaction handler.. 2014-10-08 20:31:28 -04:00
Jonas Strandstedt
eca6863450 Merge branch 'feature/camera' into solarsystem2 2014-10-08 14:36:48 +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
Alexander Bock
24e1d8f176 Unhack temporary limitation of camera to horizontal movements 2014-10-07 23:25:46 +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
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
michal
22fd3acc59 small changes to to get everything working on my end / michal 2014-09-26 17:42:07 -04:00
Jonas Strandstedt
2d359fd48c Started working on modularizing PSC and ABuffer 2014-09-26 17:03:59 +02:00
Jonas Strandstedt
c526c0f38d Added volume for debug purpose. Temporary fixed fast time. 2014-09-25 17:17:11 +02:00
Jonas Strandstedt
82ff7fa984 Merge branch 'develop' into stars
Conflicts:
	include/openspace/util/constants.h
	shaders/pscstandard_fs.glsl
	shaders/pscstandard_vs.glsl
	src/interaction/interactionhandler.cpp
	src/main.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp
	src/util/factorymanager.cpp
2014-09-24 15:39:22 +02:00
Alexander Bock
3f1e8d67ca Added more faster interaction 2014-09-17 20:11:59 +02:00
Alexander Bock
1101b656b8 Added missing change for the merge 2014-09-13 12:10:55 +02:00
Alexander Bock
954dbdce13 Merge branch 'origin/feature/ABuffer' into properties 2014-09-13 10:59:33 +02:00
michal
c1c637efa7 minor fixes, please ref to previous commit 2014-09-10 14:35:44 -04:00
michal
686c7b0b9b final calibration + scaling fix. Looks good now. 2014-09-10 11:32:23 -04:00
michal
f0f3b08ab6 some cleanup 2014-09-07 16:19:13 -04:00
michal
da9938584e Changes to the shaders, code cleanup and simplification. Eliminated lots of minor trivial bugs, should run smoothly.
- added shader-side B-V (blue-visible band) index conversion to standard RGB 0-255
- distance-modulus is computed correctly (to the 9th decimal) from one of the interleaved parameters of the vbo
- the apparent magnitudes are in relation to the cameras position in space. (needs a proper overlook / calibration)
- sprite quads are scaled with the apparent magnitude in heuristic fashion (ogl coordinates have really no real relation to empirical data)

TODO:
- Look over the quad scaling which right now is scaled using the z-distance and apparent magnitude, wont work properly if we move outside of the solar system
- Determine if scale of universe is proper
- When zooming out the camera stops at #INF and gets stuck ( had no time to look into this )
- Very red stars need dimming, probably a threshold operation
2014-09-05 16:16:55 -04:00
michal
b1851e5313 Added geometry shader for halos and separate shader for points. Parsecs->m conversion works and added test-data to datafolder. 2014-08-28 23:04:27 -04:00
michal
013d4c5bb6 WIP: intermediary commit, will attempt to run HC's code on this machine. 2014-08-25 17:37:23 -04:00
Alexander Bock
5793498ddf Added first version of ScriptEngine, allowing Lua script to set propety values 2014-08-21 18:44:42 +02:00
Jonas Strandstedt
e99a98224c Working ABuffer
- Fixed the ABuffer rendering for intersecting volumes
- Added keyboard callback for toggling renderables
- Changed textures from ClampToBorder to ClampToEdge
- Fixed transferfunctions to clamp to edge instead of fade to black
2014-07-23 16:06:49 -04:00
Jonas Strandstedt
610d5d5427 Added variable stepsize for volumes
- When holding right mouse button the stepsize for volumes will be 1/5
- Added configuration files for ccmc lab
2014-07-01 10:01:54 -04:00
Jonas Strandstedt
6419f34b5a ABuffer working with small issues
- Pointing to bugfixed Ghoul
- Pointing to Ghoul with Linux file callback
- Fixed interaction distance control bug when moving to close
- Distance control with mouse wheel added
- Kameleonwrapper normalization based on histogram
- ABuffer seems to work with small issues
2014-06-18 10:34:40 -04:00
Jonas Strandstedt
d5e6063670 Bugfixes
- Added support for volume caching
- Fixed bug when moving camera in the direction or the origin causing
position lock
- Fixed camera being to only being affected on SGCT_PRESS and
SGCT_REPEAT
2014-06-10 11:40:49 -04:00
Alexander Bock
3520bd121e Renamed pss to PowerScaledScalar 2014-05-11 18:34:57 +02:00
Alexander Bock
9bc084bf81 More PowerscaledCoordinate cleanup 2014-05-11 15:59:48 +02:00
Alexander Bock
40a2cb1068 Renamed psc to powerscaledcoordinate and pss to powerscaledscalar 2014-05-11 14:32:42 +02:00
Alexander Bock
d09a1e0b54 Misc work
More cleanup of RenderablePlanet
Added const modifier to pss method
Added faster travel method for interactionhandler
2014-05-05 18:04:53 +02:00
Alexander Bock
8a7bcc0036 Cleanup of Camera class 2014-05-04 17:06:35 +02:00
Hans-Christian Helltegen
a9e6291313 More trackball and camera work. Interaction is restricted to rotation around y 2014-05-02 11:59:23 -04:00
Jonas Strandstedt
23b921a426 Merge branch 'trackball' into kameleon
Conflicts:
	src/rendering/renderablevolumeexpert.cpp
2014-04-28 23:07:09 -04:00
Hans-Christian Helltegen
a80c5d45d4 More trackball/camera work 2014-04-28 16:02:27 -04:00
Hans-Christian Helltegen
ed93372c8b Started work on trackball-functionality in interactionhandler 2014-04-23 16:55:49 -04:00
Jonas Strandstedt
89eeae62d0 Restructuring for OpenSpace tests
- Moved all OpenSpace headers to separate include directory
- Added OpenSpaceTests binary with OPENSPACE_HAVE_TESTS define
- Added CMake setting of BASE_DIR
- Added OpenSpace initial tests for SceneGraph and SceneGraphNodes
- Added OpenSpace initial tests for psc and pss
- Restructured OpenSpace so no GL functions are called in constructors
to make the classes testable

- Todo: Make the base dir possible to set through command line argument
and configuration file
2014-03-19 14:57:10 -04:00
Jonas Strandstedt
b1eab2cf03 Finalized first draft for the SceneGraph
- Refactored several files
- Implemented PositionInformation subclasses
- Added standard shaders in the shader directory
- Removed SceneGraphLoader, now integrated in the SceneGraph

- TODO: Further testing and improvements to the PowerScale coordinate
system
2014-03-13 11:21:30 -04:00
Alexander Bock
006bd56ae6 General changes
added OpenSpaceEngine
added ConfigurationManager
added query functions
removed GLEW-related Windows warning
added old external control classes
more restructuring
2014-01-09 19:19:01 +01:00