Commit Graph

471 Commits

Author SHA1 Message Date
Alexander Bock
d628c1a667 Merge branch 'master' into feature/DU
# Conflicts:
#	data/scene/grids/grids.mod
#	ext/sgct
2017-10-17 17:09:37 -04:00
Alexander Bock
06550ea42f Add support for OpenGL 4.6
Compile fix in rawvolumewriter
2017-10-11 09:05:10 -04:00
Jonathas Costa
00757ec692 Added missing files. Fixed color in renderable du meshes. 2017-10-09 08:38:21 -04:00
Jonathas Costa
cc66165731 Disabled cache. Added initial coded for RenderablePlanesCloud. 2017-10-04 14:05:35 -04:00
Jonathas Costa
600536e7f8 Added colormap range defined. Added VectorListVerifier. Added Text rendering. Added other datavar types for Tully. Added transformantion matrix. 2017-10-04 09:23:49 -04:00
Jonathas Costa
74f0da9033 Added new data, new RenderableBillboardsCloud renderable, added and fixed multiple shaders. 2017-09-22 08:12:45 -04:00
Emil Axelsson
ea5382c028 Volume conversion and rendering (#350)
Add volume rendering features
 - Improve task runner
 - Improve reading from CDF files
 - Basic time varying volume rendering
 - Fix scaling bug in RenderableToyVolume
2017-09-22 12:03:23 +02:00
Jonathas Costa
e7f2f22f3d DU branch Quasar and WMAP. 2017-09-12 12:58:42 -04:00
Alexander Bock
0ceab49df7 Update gitignore to include Mars texture
Update SGCT reference
Update Ghoul reference
Prevent spherical grid to recreate grid each frame
Add version and commit information (closes #395)
2017-08-30 14:56:02 -04:00
Alexander Bock
09a94e6bf5 Workaround for Visual Studio 15.3 compile fix in Windows headers 2017-08-18 15:44:06 -04:00
Alexander Bock
c275b2f833 Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Alexander Bock
b9f0d60d85 Hide layergroups in RenderableGlobe that do not contain any layers
Update Ghoul repository
2017-07-28 14:49:08 -04:00
Alexander Bock
dc79a94142 Remove warnings
Update SGCT repository
Update Ghoul repository
2017-07-26 11:59:48 -04:00
Alexander Bock
0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock
9d4215695d Update Ghoul 2017-07-15 18:36:01 -04:00
Alexander Bock
3b1c2b37a0 Update ghoul repository
Adapt to the change from ghoul::any to std::any
2017-07-15 18:13:52 -04:00
Alexander Bock
713b5bb97b Fix compile error in iSWA module
Update warning specification for modules
Disable unreferenced local function warning
Update Ghoul
2017-07-15 17:48:03 -04:00
Alexander Bock
469140f4f0 C++17 nested namespace test 2017-07-15 15:37:42 -04:00
Alexander Bock
ec6641038d Make use of C++17 features in LuaConsole and filesystem walking 2017-07-15 14:37:00 -04:00
Alexander Bock
99b5d09fc2 Update Ghoul repository 2017-07-14 17:47:08 -04:00
Alexander Bock
87d25549c1 Fix line ending for Jenkinsfile
Update Ghoul repository
2017-07-13 12:24:23 -04:00
Klas Eskilson
98534bc1ec Normalize ALL the line endings (#361)
* Normalize ALL the line endings

* Add Ghoul respository and openspace.cfg
2017-07-13 12:08:47 -04:00
Alexander Bock
3f445a1c4c Update Ghoul repository 2017-07-12 16:56:51 -04:00
Alexander Bock
c26fe4b279 Move SGCT config files into main config folder and remove unused transferfunctions 2017-07-08 16:06:45 -04:00
Alexander Bock
0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00
Alexander Bock
644e7fbe98 Update Ghoul repository
Make Jenkins less verbose on Windows and Mac
2017-07-03 11:43:21 -04:00
Alexander Bock
467a6c3542 Start migrating from GLEW to glbindings
Fix compile errors from wrong function parameters in OpenGL calls
2017-07-03 01:37:53 -04:00
Alexander Bock
8a781a2028 Compile fix for Windows 10 SDK 2017-07-01 15:26:39 -04:00
Alexander Bock
e358d9d27c Update to C++17 2017-07-01 12:31:26 -04:00
Alexander Bock
bb9cd19bb6 Update SGCT reference 2017-06-21 18:55:52 -04:00
Alexander Bock
e7cf64bcf2 Update SGCT reference 2017-06-21 15:35:36 -04:00
Alexander Bock
d61e6db61c Update SGCT reference 2017-06-21 15:24:10 -04:00
Alexander Bock
3536348bd0 Update SGCT repository 2017-06-21 14:30:27 -04:00
Alexander Bock
109d6563b5 Remove tinythread in SGCT and replace with std::thread 2017-06-21 14:14:22 -04:00
Alexander Bock
681f9240e8 Update Ghoul repository 2017-06-21 11:41:13 -04:00
Alexander Bock
f99d482526 Update Ghoul repository 2017-06-09 17:53:18 -04:00
Alexander Bock
7775435eab Do not sort properties and propertyowners automatically (closes #269) 2017-06-09 11:26:38 -04:00
Alexander Bock
9a7eba16bd Remove warnings
Update Ghoul repository
Fix spelling mistake in openspace.cfg
2017-06-08 00:07:51 -04:00
Alexander Bock
1e0240b47a Update Ghoul repository 2017-06-07 17:14:12 -04:00
Michael Novén
bb05ef46a1 Update json library to latest version (#322) 2017-06-06 13:44:27 -04:00
Alexander Bock
5096e3ffad Update SGCT 2017-06-06 12:08:27 -04:00
Alexander Bock
f1d8879a8b Merge remote-tracking branch 'origin/master' into feature/use-renamed-cmake-copy-macro 2017-06-06 11:52:03 -04:00
Klas Eskilson
684327aced Update Ghoul version 2017-06-05 16:05:59 -04:00
Alexander Bock
994ba32f44 Add the ability for LuaLibrary%s to reference script files that will be executed (closing #328)
Create documentation for Lua scripts
Add Lua script to check if a file exists
2017-06-02 17:36:00 -04:00
Alexander Bock
bb3256d9e4 Add Lua callbacks that will walk a directory tree and return values as a table 2017-06-02 11:50:55 -04:00
Kalle Bladin
f51f293989 Feature/globebrowsing optimization (#310)
* Simplest possible PBO implementation.

* Add PBO class

* TileLoadJob owns raw tile data

* Working on a soluton to cache textures and reuse them

* PBO and cached textures working for one texture type. Color textures.

* Threadpool for tile requests uses LRU cache as queue

* Remove framesUntilRequestFlush

* Clean up

* Clean up

* Use prioritizing concurrent job manager

* Use TileTextureInitData to initialize RawTileDataReader.

* Class TextureContainer owns the textures to use for tiles.

* Using TileTextureInitData to determine if new caches need to be created.

* Remove WriteDataDescription

* Remove TileDataLayout

* Rendering many different layer types again

* TileProviderByLevel gives layergroup id to tile providers

* Comment away use of PBO

* Erase unfinished requests to make room for new ones

* Enable choice of PBO or not.

* Enable resetting of asynctiledataprovider

* Add the ability to use PBO and also load to CPU

* Update ghoul

* Solve culling issue.

* Texture pointer of Tile is now a raw pointer. Currently break single image tile provider and text tile provider.

* Add gpudata

* Move fetching of shader preprocessing data to LayerManager

* No comparisons to determine shader recompilation.

* Show the tile cache size in the GUI

* Clean up and comment.

* Solve bug where float is interpreted as NaN

* Enable ability to blend between layers again

* Fix single image provider

* Fix windows build error

* Fix OSX compile issue.

* Some clean up

* Showing correct texture data size

* Enable use of text tile providers again. No backgroupd image path however.

* Change cache size from GUI

* Clean up

* Solve osx compilation error.

* Update ghoul

* Make it possible to switch between PBO and not during runtime.

* Enable resetting of tile datasets

* change function module in moduleengine to identify module by name

* MemoryAwareTileCache is no longer a singleton

* Update ownership of properties for globe browsing

* Logging info about resetting tile reader.

* Logging info

* Fix requested changes

* Fix some compile warnings.

* Fix compilation warnings

* Add ability to blend values with blend parameter. Also define settings through lua dict.

* Fix some comments on pull request.

* Change formatting

* Change formatting

* Change formatting

* Fix pull request comments.

* Those are details

* Make Mercury great again.

* Make Earth great again.

* Solve conflict

* Test to sometimes use valueblending and sometimes not

* Not always use value blending

* Update ghoul

* Change from auto to explicit type.

* Update test for LRU Cache

* Include algorithm.
2017-05-30 15:37:05 +02:00
Alexander Bock
302d3eb64e Don't use outline fonts for Console
Update Ghoul repository
2017-05-19 16:39:58 -04:00
Alexander Bock
7d5a53fb5e Update SGCT 2017-05-10 09:18:29 -04:00
Alexander Bock
ddc9ef1bc5 Add abstract class to handle Handlebar-based documentation file generation
Apply Documented class to the InteractionHandler
Update Ghoul
2017-05-09 18:06:14 +01:00
Alexander Bock
63d607281a Update SGCT repository
Add property to toggle date rendering independent from rendering statistics
2017-05-09 10:30:35 +01:00