Commit Graph

3028 Commits

Author SHA1 Message Date
Alexander Bock
ea6d8d683b Merge branch 'feature/projectiontexturemap' into develop 2016-08-19 08:36:12 +02:00
Alexander Bock
e14387a4fa Update the data files for Pluto and Charon to download all necessary files 2016-08-19 08:35:44 +02:00
Alexander Bock
4da2f1e5be Merge branch 'develop' into feature/projectiontexturemap 2016-08-19 08:23:20 +02:00
Alexander Bock
21e9599888 SyncWidget in Launcher must also compare base directory before removing duplicates (closing #126) 2016-08-18 17:33:08 +02:00
Alexander Bock
2ae7095d9b Fix image dilation (closing #108)
- Using pixel(=texel) coordinates and integer offsets
 - Using a single channel stencil texture instead of a 4-channel one
2016-08-18 16:29:00 +02:00
Alexander Bock
72e1e9231a Add an update method to the ProjectionComponent that takes care of Shader rebuildin 2016-08-18 16:27:44 +02:00
Alexander Bock
010b8739f1 Use the correct output in the renderablemodelprojection shader 2016-08-18 15:45:07 +02:00
Alexander Bock
e5db594c3b Add torrent for new missing Rosetta kernels 2016-08-18 13:55:00 +02:00
Alexander Bock
788ec99575 Merge branch 'develop' into feature/projectiontexturemap
Conflicts:
	support/cmake/support_macros.cmake
2016-08-18 13:23:55 +02:00
Alexander Bock
e284543434 Make use of a secondary stencil buffer for masking the dilation areas 2016-08-18 11:43:51 +02:00
Emil Axelsson
c4c9396441 add rosetta image of the day crawler 2016-08-18 11:12:28 +02:00
Alexander Bock
f8333171a8 Merge commit '6c43d8404aa29290909b5f7ce838bbd503576cb4' into develop 2016-08-17 20:04:17 +02:00
Alexander Bock
6c43d8404a Added missing files 2016-08-17 16:27:13 +02:00
Alexander Bock
c93d882ea6 Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
Alexander Bock
04d67d0baf Merge commit 'c9cd968d34f691fe34e68cf7e68abff201f72b30' into develop 2016-08-17 15:09:10 +02:00
Alexander Bock
c9cd968d34 Add rosettaimages to the .data file for automatic download 2016-08-17 15:08:27 +02:00
Alexander Bock
1900abc70f Enable Edit and Continue feature 2016-08-17 11:25:58 +02:00
Alexander Bock
92d61851d8 Enable the setting of the Texture value of the renderabledebugplane in a mod file 2016-08-17 11:25:47 +02:00
Alexander Bock
4f1fe0dd49 Add optional image dilation to the ProjectionComponent 2016-08-17 11:25:29 +02:00
Alexander Bock
f9e66c315c Enable Edit and Continue in Visual Studio 2016-08-16 10:49:52 +02:00
Emil Axelsson
d0e520943c Merge branch 'develop' of github.com:OpenSpace/OpenSpace into develop 2016-08-16 10:39:36 +02:00
Alexander Bock
7f757bbcb7 Use correct normal for RenderableRings closing (#124) 2016-08-16 09:41:13 +02:00
Alexander Bock
dd9eeeb092 Remove the use of PowerScaledCoordinates in the RenderableModel as it caused an interpolation issue (closing #107) 2016-08-15 20:06:04 +02:00
Emil Axelsson
2112f54519 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into develop 2016-08-15 13:36:41 +02:00
Emil Axelsson
95ea64609f link against zlibstatic built by ghoul 2016-08-15 13:36:04 +02:00
Alexander Bock
214a3ffde6 Update Ghoul reference 2016-08-15 10:28:19 +02:00
Matthew Territo
cc0dfdf5d1 Add simple ability to cycle through FPS (instead of Frametime) with t / Shift+t 2016-08-11 20:56:18 -06:00
Matthew Territo
c3ae58afba Add access to deltaTime/getDt in SGCT/WindowWrapper 2016-08-11 19:19:07 -06:00
Alexander Bock
af672b6a4e - Update Ghoul reference
- Remove not needed cmake files
- Make ConcurrentJobManager compile again
2016-08-11 11:12:15 +02:00
Matthew Territo
dd74204eb7 Add ghoul/misc/threadpool.h
Fix namespaces to include ghoul::
2016-08-03 15:04:47 -06:00
Alexander Bock
42542bbb68 Include Jenkins compile fix 2016-08-03 11:08:57 +02:00
Alexander Bock
662e25963b Move ThreadPool class from OpenSpace into Ghoul 2016-08-03 10:58:53 +02:00
Alexander Bock
cd1c17aa08 Let the destruction of the global PerformanceMeasurement shared data block also delete all local copies
Closing #113
2016-08-02 10:13:57 +02:00
Alexander Bock
3312ebd0fe Correctly increase the reference count on PerformanceManager 2016-08-01 23:55:49 +02:00
Alexander Bock
9b84511a11 Implement a reference counting so that the global memory layout can be created from multiple applications 2016-08-01 22:13:46 +02:00
Alexander Bock
50dd45fbb1 Add an indirection layer to the PerformanceManager to support multiple shared memory blocks in cases of multiple windows per node 2016-08-01 16:20:23 +02:00
Alexander Bock
b72167a270 Add dependency calculation to the buildAllModuleCombination Jenkins script (closing #116) 2016-08-01 14:34:36 +02:00
Alexander Bock
5fb03eeb4a CMake generator fix for when no modules are selected 2016-08-01 14:13:42 +02:00
Alexander Bock
c418536827 Add script to build OpenSpace with no modules enabled 2016-08-01 14:06:46 +02:00
Alexander Bock
bf4989d396 Changing request URL for the Launcher
Update gitignore file
2016-08-01 13:59:10 +02:00
Alexander Bock
81c18b2b62 Updated URLs in code or comments 2016-08-01 11:05:50 +02:00
Alexander Bock
48b5ae9166 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-08-01 09:39:49 +02:00
Alexander Bock
93b30f5078 Some cleanup of RenderableShadowCylinder 2016-07-31 22:23:20 +02:00
Alexander Bock
3fb6d3aa84 Some cleanup of RenderableFov 2016-07-31 21:43:55 +02:00
Alexander Bock
484ef636c7 PerformanceManager will automatically delete SharedMemory object if it was left previously 2016-07-31 21:24:47 +02:00
Alexander Bock
7e98922bdd Enable rendering of IVecX properties in the GuiPropertyComponent 2016-07-31 21:24:12 +02:00
Alexander Bock
5f1fa3f755 Implement shadowing on RenderableRings 2016-07-31 20:22:29 +02:00
Alexander Bock
052e6007cd Rename static constants in Property class 2016-07-31 19:27:13 +02:00
Alexander Bock
6bd0ef7102 Make OpenSpaceModule a properties::PropertyOwner so that it can own properties
Add properties owned by OpenSpaceModule to the global settings engine (closing #104)
2016-07-31 19:26:55 +02:00
Alexander Bock
393f39de2e Let the module registration script return a lambda that will contain all modules, thus removing the static initialization order problem 2016-07-31 19:25:15 +02:00