Commit Graph

82 Commits

Author SHA1 Message Date
Alexander Bock
2fce471743 Started cleanup of module structure 2015-12-14 10:50:38 -08:00
Alexander Bock
e26f1d41a4 Updated Ghoul version
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock
ae55078ff8 Updated Ghoul version
Adapted to changed Ghoul API
Reenable fading of ScreenLog messages
2015-12-11 16:50:21 -05:00
Alexander Bock
cd3a819541 Updating Ghoul version
Applying new Ghoul changes
2015-12-09 14:41:50 -05:00
Alexander Bock
875de328aa Update Ghoul version
Make the modules depend on C++14
Change the OpenSpace code to the new Ghoul version
2015-12-07 18:54:17 -05:00
Alexander Bock
999f198aa3 Updated tinyobjloader and applied the changes 2015-11-30 15:01:02 -05:00
Alexander Bock
5c6943477a Updated Ghoul
Applied new Ghoul changes
2015-11-30 14:32:06 -05:00
Alexander Bock
383c7028a8 Applied changes in texture reading io classes to OpenSpace 2015-11-24 18:15:23 -05:00
Alexander Bock
3806318b0d Applied Ghoul cleanups 2015-11-22 21:26:02 -05:00
Alexander Bock
2cc1a91fad Rename SpiceKernelException to SpiceException 2015-11-21 23:15:48 -05:00
Alexander Bock
443963a151 Finished cleanup of SpiceManager 2015-11-20 18:36:03 -05:00
Alexander Bock
2c84368b0b More cleaning of SpiceManager 2015-11-20 00:54:19 -05:00
Alexander Bock
12fdb23684 More cleanup in SpiceManager 2015-11-19 19:47:50 -05:00
Alexander Bock
16897bb8d4 Make the aberration correction specification for targetPosition in SpiceManager explicit by including a seprate class for it 2015-11-19 15:33:57 -05:00
Alexander Bock
11fec9387b More changes on the documentation and Exception handling in SpiceManager
Change some interfaces on SpiceManager
Removed target position return in powerscaled coordinates and only use glm::dvec4 instead as the Spice library does not have higher accuracy anyway
2015-11-19 13:40:44 -05:00
Alexander Bock
fad2c642f8 Cleanup of SpiceManager by introducing exceptions
Catch exceptions in RenderableShadowCylinder and LabelParser
Catch exceptions in RenderableFov and Hongkangparser
2015-11-18 21:55:25 -05:00
Alexander Bock
f7f5f2e262 Started cleanup of SpiceManager
Clean boost message output
Update to new Ghoul with cppformat library
2015-11-17 23:54:54 -05:00
Alexander Bock
26520ed63b Compile fix for the new GLM version 2015-10-27 14:24:09 -05:00
Alexander Bock
390f5be4a8 Removing includes of sgct.h 2015-10-26 16:14:38 -05:00
Alexander Bock
49dbb1ce20 More work on converting to SGCT window handler
Adapting to change in SGCT key callback handling
2015-10-26 09:19:28 -05:00
Alexander Bock
d84edc4090 More work on transitioning to windowwrapper for keyboard and mouse interaction 2015-10-25 17:34:03 -05:00
Alexander Bock
26ea512910 Set Interaction sensitivity to 1 on default 2015-10-25 11:27:41 -05:00
Alexander Bock
f8f48acb98 Implementation of the windowhandler interface 2015-10-20 23:30:40 +02:00
Alexander Bock
1ca4b9c285 Enable NOMINMAX compiler defintions in Windows on default 2015-10-13 00:15:44 +02:00
Alexander Bock
bc5eec4158 Merge branch 'develop' into feature/remote_redesign
Conflicts:
	src/util/spicemanager.cpp
2015-07-08 16:51:40 +02:00
Michal Marcinkowski
284989d48c Cleanup and refractoring of RenderableFov.cpp
- Removed code causing memleaks
- Improved MVIC intersection when no cornerpoints intersect
- General readability and logical fixes (long overdue)
- Fix so arbitrary amount of fov-bound-vectors can be loaded
- Updated keybinds & data etc
2015-07-08 00:14:01 -04:00
Alexander Bock
72ba616414 Merge branch 'develop' into feature/remote_redesign
Conflicts:
	modules/base/shaders/path_fs.glsl
2015-07-07 20:31:01 +02:00
Alexander Bock
52146a79a6 Remove old script messages for changing the origin and the coordinate system
Adapt the onscreen-gui to use the new property mechanism
Adapt the Timeline GUI to use the new property mechanism
2015-07-07 18:52:09 +02:00
Alexander Bock
9e06b612a7 Remove the unused location declarations in the shader to make OpenSpace compatible with OpenGL 4.0 2015-07-07 11:17:56 +02:00
Michal Marcinkowski
202ec5e704 remove std::cout message 2015-07-06 11:02:42 -04:00
Michal Marcinkowski
2a3f0bbcca Optimization quick-fix for projections:
- Using queue to distribute imagesequencer-returned images 1 image/ frame
- Imagesequencer no longer returns 'reversed' image-vector
2015-07-06 10:35:03 -04:00
Alexander Bock
003a438602 Removed while loops from path_vs that caused driver issues with big w values
Removed error that caused the postDraw method not to be called on slave nodes
2015-07-04 15:41:43 +02:00
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