1436269959
fix windows merge conflict error
2016-03-17 16:06:21 -04:00
e8175ee54c
solved merge conflict, fix for close(socket) in paralellconnection
2016-03-17 14:41:05 -04:00
b09026ee42
Merge branch 'develop' into MultiModelFormatReader
2016-03-16 10:44:07 -04:00
7e34f226ba
CMake default module conf for NewHorizons.
2016-03-16 09:17:28 -04:00
c3aa8fecc2
Update ghoul to account for removed boost dependency
2016-03-15 23:59:57 +01:00
df0d0d1258
Update Ghoul version to accommodate public API bool parameter changes
2016-03-06 08:08:06 +01:00
ebbbbb2dfd
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
src/rendering/renderengine.cpp
2016-02-08 15:07:38 +01:00
781ca62742
fix bugs in fisheye rendering
2016-02-08 14:33:19 +01:00
dd98cef974
Enable the RenderableShadowCylinder's color to be set via properties
2016-02-07 20:37:11 +01:00
2f7fbb1f39
Uncomment old Progressbar from Kameleon to make jenkins compile again
2016-02-05 23:00:12 +01:00
794bbcedda
Fix more GLM degrees->radians changes
2016-02-05 22:48:49 +01:00
f266f0bcee
Updated copyright header
2016-02-05 22:47:37 +01:00
7e3024959a
Remove the disabling of the blend function after an image projection that caused flickering
...
Set the window resolution in the framebuffer renderer
Fix spelling errors in CK kernel error messages
Reference new leap second kernel
2016-02-05 20:48:35 +01:00
877a4d1ba6
Updated copyright header
2016-02-05 17:43:21 +01:00
a6a9537b6c
Merge with antialiased abuffer
2016-02-03 17:47:29 +01:00
d4ff8119d1
refactor abuffer and add msaa support. volumes temporarily disabled.
2016-02-02 11:30:27 +01:00
f1437c7183
Remove superfluous LINFO in RenderablePlanetProjection
2016-01-31 13:59:18 +01:00
cee66b9c5e
Fix image projection error that occurred due to degrees v radians glm functions
...
Don't crash if a shader recompile fails, but log an error
Use correct file extension for binary Spice kernels
2016-01-31 13:56:46 +01:00
50228d9296
Updated Ghoul repository
...
GCC compile fix
2016-01-18 17:42:51 +01:00
0735d0fc2d
More cleanup of FactoryManager
2015-12-14 17:55:24 -08:00
177571195c
Completely remove references to constants.h
2015-12-14 17:36:15 -08:00
c92fc923f9
Remove constants.h file
...
Reenable LuaConsole rendering
2015-12-14 17:21:22 -08:00
6eca5c0f68
More module cleanup
2015-12-14 11:46:44 -08:00
2fce471743
Started cleanup of module structure
2015-12-14 10:50:38 -08:00
e26f1d41a4
Updated Ghoul version
...
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
cd3a819541
Updating Ghoul version
...
Applying new Ghoul changes
2015-12-09 14:41:50 -05:00
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
383c7028a8
Applied changes in texture reading io classes to OpenSpace
2015-11-24 18:15:23 -05:00
2cc1a91fad
Rename SpiceKernelException to SpiceException
2015-11-21 23:15:48 -05:00
443963a151
Finished cleanup of SpiceManager
2015-11-20 18:36:03 -05:00
2c84368b0b
More cleaning of SpiceManager
2015-11-20 00:54:19 -05:00
12fdb23684
More cleanup in SpiceManager
2015-11-19 19:47:50 -05:00
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
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
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
390f5be4a8
Removing includes of sgct.h
2015-10-26 16:14:38 -05:00
26ea512910
Set Interaction sensitivity to 1 on default
2015-10-25 11:27:41 -05:00
f8f48acb98
Implementation of the windowhandler interface
2015-10-20 23:30:40 +02:00
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
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
202ec5e704
remove std::cout message
2015-07-06 11:02:42 -04:00
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
bae990babb
Some work on making the TimelineGui work with the new hybrid parsers
2015-07-01 23:40:38 +02:00
cc5e6074ad
Rename imagesequencer2 to imagesequencer
2015-07-01 22:03:52 +02:00
40c42ff772
Fix the scaling of renderablemodel by making the magnification a floatproperty
2015-07-01 17:56:51 +02:00
8f88ead113
Remove crashing error from imagesequencer2
2015-07-01 17:55:41 +02:00
c205c720c6
Removal of the old imagesequencer
2015-07-01 17:55:26 +02:00
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
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
bbca384a9c
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-06-25 20:29:27 -04:00
Michael Nilsson