mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 08:49:20 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,711 Commits 83 Branches 48 Tags
dcf5507e1c21e87aa851346bc494ae3be6060d6f
Commit Graph

135 Commits

Author SHA1 Message Date
Alexander Bock 6b5681626b Removing clang-analyze warnings 2016-04-13 11:46:07 -04:00
Emil Axelsson 48bd41ad9f merge in changes from develop 2016-04-12 16:29:35 +02:00
Alexander Bock e4f8f8c830 Clang compile fixes 2016-04-11 11:18:50 -04:00
Emil Axelsson 4ff0205eae bring in support for multiresolution volume rendering 2016-04-11 16:56:44 +02:00
Alexander Bock 3de5fb3b55 Add FloatProperty to RenderableStars to modify transparency (closing #150) 2016-04-08 15:11:46 +02:00
Alexander Bock 72ccfe51e9 Ignore empty lines in Speck file reading (closing #133) 2016-04-08 15:06:13 +02:00
Alexander Bock 8f4d3c20eb Untabify RenderableStars 2016-04-08 15:00:43 +02:00
Alexander Bock 7c750ff2a2 Merge branch 'develop' into feature/newhorizons 2016-04-08 13:54:23 +02:00
Alexander Bock 2acb2cbd92 Updated ghoul repository 
Make use of automatic conversion and swizzling of textures
 2016-04-07 19:07:18 +02:00
Alexander Bock e23a1f3e3c Fix compilatioon of renderablefieldlines 2016-04-04 20:26:27 +02:00
Michael Nilsson 2ca5d52fa3 fix for linux 2016-03-28 11:25:04 -04:00
Emil Axelsson 80fe89dbc8 change interfaces from pointer to reference 2016-03-23 14:00:40 +01:00
Emil Axelsson c5aba19d52 Merge branch 'master' of github.com:OpenSpace/OpenSpace-Development into develop 2016-03-23 13:33:42 +01:00
Emil Axelsson 0b3cbaa961 fix bug in multimodelgeometry loading, initializing w to 0 for all vertices 2016-03-23 11:52:29 +01:00
Emil Axelsson a44eed992f Merge remote-tracking branch 'origin/feature/volumerendering' into develop 2016-03-21 18:55:32 +01:00
Emil Axelsson 55660846f1 Add missing copyright statements 2016-03-21 17:04:10 +01:00
Emil Axelsson ebe10a29b5 Volume rendering compatible with abuffer and framebuffer renderers 2016-03-21 16:40:24 +01:00
Alexander Bock 8031a8c2d4 Fixed RenderableModelProject problem with degrees v radians 
Added 67P coordinate system to onscreen gui
 2016-03-18 23:00:37 +01:00
Michael Nilsson 97aa12b77b added boost dependency to kameleon module 2016-03-18 17:09:51 -04:00
Jonathas Costa b09026ee42 Merge branch 'develop' into MultiModelFormatReader 2016-03-16 10:44:07 -04:00
Jonathas Costa 7e34f226ba CMake default module conf for NewHorizons. 2016-03-16 09:17:28 -04:00
Jonathas Costa be34d7c303 Added multimodelgeometry.* files to the project and removed wavefrontgeometry.* files from the project. 2016-03-16 09:08:47 -04:00
Jonathas Costa 3a9e5e5790 Removed WavefrontGeometry class register and added the MultiModelGeometry class register. 2016-03-16 09:05:16 -04:00
Jonathas Costa 7c57b870f0 Changes to accept the new multi-geometry handler, removed wavefrontgeometry header file include and identation fixes. 2016-03-16 09:03:55 -04:00
Jonathas Costa 69e8a1a163 New multi-geometry model handler. 2016-03-16 08:56:18 -04:00
Alexander Bock c3aa8fecc2 Update ghoul to account for removed boost dependency 2016-03-15 23:59:57 +01:00
Alexander Bock df0d0d1258 Update Ghoul version to accommodate public API bool parameter changes 2016-03-06 08:08:06 +01:00
Alexander Bock 2b7a532f57 Merge branch 'develop' 2016-02-21 14:22:14 +01:00
Alexander Bock 7b1670ea0b Remove startup warnings 2016-02-21 01:50:51 +01:00
Emil Axelsson 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
Emil Axelsson 781ca62742 fix bugs in fisheye rendering 2016-02-08 14:33:19 +01:00
Alexander Bock dd98cef974 Enable the RenderableShadowCylinder's color to be set via properties 2016-02-07 20:37:11 +01:00
Alexander Bock 50f1743067 Make onscreen gui not break if resolution is changed 2016-02-07 15:09:25 +01:00
Alexander Bock 2f7fbb1f39 Uncomment old Progressbar from Kameleon to make jenkins compile again 2016-02-05 23:00:12 +01:00
Alexander Bock 794bbcedda Fix more GLM degrees->radians changes 2016-02-05 22:48:49 +01:00
Alexander Bock f266f0bcee Updated copyright header 2016-02-05 22:47:37 +01:00
Alexander Bock 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
Alexander Bock 877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Alexander Bock 86e6c21f96 - Make missing SGCT a non-fatal error in CMake 
- Add screen sizes to the abuffer dictionary
- Use the new method for setting the screen size in the star rendering
 2016-02-04 21:41:17 +01:00
Emil Axelsson 789ede5197 disable volume module to suppress compilation errors 2016-02-04 10:02:16 +01:00
Emil Axelsson a6a9537b6c Merge with antialiased abuffer 2016-02-03 17:47:29 +01:00
Emil Axelsson d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock f1437c7183 Remove superfluous LINFO in RenderablePlanetProjection 2016-01-31 13:59:18 +01:00
Alexander Bock 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
Alexander Bock 50228d9296 Updated Ghoul repository 
GCC compile fix
 2016-01-18 17:42:51 +01:00
Alexander Bock bae8d0aa76 Making OpenSpaceTest application compile with API change 
Set default start to July 2015
Move default window out of the corner
Compile fixes
 2016-01-14 16:05:29 +01:00
Alexander Bock 13510e1085 Merge branch 'feature/cleanup' of openspace.itn.liu.se:/openspace into feature/cleanup 2016-01-02 21:40:29 +01:00
Alexander Bock c87fdfd38b Fixes for Windows 
Fixing shader paths for fieldlines rendering
Update Kameleon to work with MSVC 2015 fix
 2016-01-02 21:40:15 +01:00
Alexander Bock 1a4ea8763e Fix performance window access to SharedMemory 2015-12-23 14:41:17 -05:00
Alexander Bock 0735d0fc2d More cleanup of FactoryManager 2015-12-14 17:55:24 -08:00