Commit Graph

50 Commits

Author SHA1 Message Date
Alexander Bock
bae990babb Some work on making the TimelineGui work with the new hybrid parsers 2015-07-01 23:40:38 +02:00
Alexander Bock
cc5e6074ad Rename imagesequencer2 to imagesequencer 2015-07-01 22:03:52 +02:00
Alexander Bock
40c42ff772 Fix the scaling of renderablemodel by making the magnification a floatproperty 2015-07-01 17:56:51 +02:00
Alexander Bock
8f88ead113 Remove crashing error from imagesequencer2 2015-07-01 17:55:41 +02:00
Alexander Bock
c205c720c6 Removal of the old imagesequencer 2015-07-01 17:55:26 +02:00
Michal Marcinkowski
cafd89e9fa Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	scripts/default_startup.lua
2015-06-29 16:40:09 -04:00
Michal Marcinkowski
d102a16a82 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
modules/newhorizons/rendering/renderableplanetprojection.cpp
	modules/newhorizons/util/hongkangparser.cpp
	modules/newhorizons/util/hongkangparser.h
	modules/newhorizons/util/imagesequencer2.cpp
	modules/newhorizons/util/labelparser.cpp
	modules/newhorizons/util/labelparser.h
2015-06-29 16:39:09 -04:00
Anton Arbring
bbca384a9c Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-06-25 20:29:27 -04:00
Michal Marcinkowski
e0ea622989 Adding hybrid read method for Pluto
Cleanups + logical changes to parsing and sequencing
2015-06-25 20:19:08 -04:00
Anton Arbring
927cfc2766 Adding the possibility to project to arbitrary bodies model files
Class RenderableModelProjection, using the geometry position and texture
coordinate data instead of reverse engineering the geometry in shader.

Adding the shaders used to project and the modified model shader.
Adding the new Renderable class to newHorizons module and CMakelist
2015-06-25 20:12:37 -04:00
Anton Arbring
901ed6053e Adding support for imageplanes for multiple instruments 2015-06-25 20:08:35 -04:00
Anton Arbring
4e72e248c3 Fixing bug in model magnification 2015-06-25 20:07:21 -04:00
Alexander Bock
5227ce2213 Renamed OpenSpaceModule's initialize method to create
Created new initialize method that gets called in OpenSpaceEngine initialize
2015-06-22 23:09:19 +02:00
Alexander Bock
978b535a2f Remove setName function from OpenSpaceModule and move naming into constructor 2015-06-22 22:57:15 +02:00
Alexander Bock
4ae8211508 Fix method renaming error in volume module 2015-06-22 18:14:33 +02:00
Alexander Bock
072a6d3cc1 Fixes to prevent crashes when data is not available 2015-06-22 14:44:31 +02:00
Alexander Bock
2e945457ea Merge branch 'develop' into feature/downloadmanager 2015-06-22 13:39:54 +02:00
Anton Arbring
c7a3048dda Fix Jenkins error and minor cleanup 2015-06-21 20:23:40 -04:00
Anton Arbring
ad55309b0e Cleaning up my own mess 2015-06-21 20:13:44 -04:00
Anton Arbring
6f72010725 Changes to facilitate model projection, also added posibility to define model exaggeration per obj 2015-06-21 20:11:19 -04:00
Anton Arbring
e5d6bef5c9 Changed how translations are found to avoid crash with broken lbl files 2015-06-21 20:05:25 -04:00
Anton Arbring
083f2948e9 Fixed FoV crash when the input is incorrect 2015-06-21 20:03:47 -04:00
Anton Arbring
5e0756fa05 Fixed trail start/stop time bug 2015-06-21 20:01:44 -04:00
Anton Arbring
45f1104814 Some cleanup in planeprojection 2015-06-21 19:59:15 -04:00
Alexander Bock
bab7b5f490 Move renderings from Anisotropic filtering to Linear filtering 2015-06-18 16:51:37 +02:00
Alexander Bock
f58d6d91b5 Enable setting the capabilities verbosity using the configuration file 2015-06-18 14:29:34 +02:00
Joakim Kilby
63cce6226e Removed redefinition of BOOST_ROOT from cmakelists 2015-06-16 11:28:34 +02:00
Alexander Bock
a798edf198 Added missing space for a message logging of model geometry
Update Ghoul
2015-06-05 16:27:31 +02:00
Alexander Bock
d8f7db46e8 Fix CMakeLists to be in proper order 2015-06-04 01:57:21 +02:00
Alexander Bock
d8c80796e4 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-06-04 01:55:58 +02:00
Alexander Bock
0953b35bb6 Add RenderableShadowCylinders to the New Horizons CMakeLists file 2015-06-04 01:54:59 +02:00
Michal Marcinkowski
0069b88f7c Fixing jenkins error 2015-06-03 19:53:40 -04:00
Alexander Bock
3c6ef4d288 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2015-06-04 01:44:41 +02:00
Alexander Bock
16e09e5802 Remove static code analysis warnings 2015-06-04 01:44:31 +02:00
Michal Marcinkowski
7492fa2f6c New Additions:
Shadow cylinders extending from planet terminator in opposite dir of sun
Plane that displays the global texture map of a planet as projections appear
^latter is an addition to RenderablePlane class, a renderable plane can have
boolean keyword "ProjectionListener" - determines whether or not it displays
2015-06-03 19:10:34 -04:00
Alexander Bock
9d733eb613 Moving Kameleon into its own module
Moving fieldline rendering into its own module
2015-05-26 23:51:15 +02:00
Alexander Bock
77cc5dba49 Moving onscreen gui into its own module 2015-05-26 22:52:12 +02:00
Alexander Bock
659326b9a9 Remove 1500+ memory leaks in OpenSpace and Ghoul 2015-05-25 19:37:56 +02:00
Alexander Bock
ef58668b81 Making OpenSpace compile and run when the NewHorizons module is not loaded 2015-05-23 20:47:06 +02:00
Alexander Bock
4585ee1422 More cleanup of CMakeLists 2015-05-23 12:57:14 +02:00
Alexander Bock
b882ba6078 Getting a running version of modularized cmakelists up and running 2015-05-23 02:03:06 +02:00
Alexander Bock
f2a7ea9630 Fixing compile warning 2015-05-23 01:39:23 +02:00
Alexander Bock
8f0e1edcdd Reorganized CMakeLists file and included new Ghoul format 2015-05-22 01:17:15 +02:00
Alexander Bock
ca7dcd4762 Move shaders into their correct modules
Add path determination to modules that automatically sets correct path resolve tokens
2015-05-21 15:17:38 +02:00
Alexander Bock
e51df4b2a0 Sorting more classes into the correct modules 2015-05-20 21:40:52 +02:00
Alexander Bock
59e474d5cd Modularize the newhorizons and volume classes 2015-05-20 21:08:21 +02:00
Alexander Bock
523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Jonas Strandstedt
5963920953 Added support for configuration file
- BASE_PATH is set using the openspace.cfg file. The binary will look
upwards in the directory hierarchy until it is found.
- All other paths is defined in the configurationfile. Paths may be
absolute or relative using the ${BASE_PATH} token
- Moved SGCT configuration files to its own folder
- Updated tests to support new configuration loading

- TODO: Make the loading of configuration easier for the programmer.
2014-04-04 11:00:25 -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
Alexander Bock
9885f52fd0 initial commit of transferred code from the old project 2014-01-04 18:24:33 +01:00