Commit Graph

4336 Commits

Author SHA1 Message Date
Matthew Territo
d65a83dfbc Merge remote-tracking branch 'origin/master' into feature/statlogs
# Conflicts:
#	Jenkinsfile
#	openspace.cfg
2017-07-13 11:05:02 -06:00
Matthew Territo
9f8036fa0e Line endings 2017-07-13 11:00:50 -06:00
Alexander Bock
b09f89f918 Build OpenSpace on Linux Jenkins multithreaded
Remove unused NASM declaration
2017-07-13 12:26:19 -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
Matthew Territo
cdb84ac111 Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-13 09:06:13 -06:00
Kalle Bladin
6e16466755 Back to LF line endings (#359)
* Auto update line endings to LF in main.cpp and openspaceengine.cpp

* Add .editorconfig

This is a tool that allows you to tell multiple editors what type of code
style and configuration that should be used. It unifies the settings and
makes the risk of running into config-related issues smaller.
2017-07-13 16:49:42 +02:00
Kalle Bladin
ca90faab75 Include globebrowsing module to avoid linking errors. (#360) 2017-07-13 13:31:27 +02:00
Matthew Territo
895f0acbdc Move logs into ${LOGS} directory 2017-07-12 19:33:01 -06:00
Alexander Bock
2fc28043a1 Merge remote-tracking branch 'origin/master' 2017-07-12 16:57:01 -04:00
Alexander Bock
3f445a1c4c Update Ghoul repository 2017-07-12 16:56:51 -04:00
Alexander Bock
520b057755 Create .gitattributes 2017-07-12 16:55:54 -04:00
Alexander Bock
db9db49716 Provide a static member variable Name for all OpenSpaceModules 2017-07-12 13:59:16 -04:00
Matthew Territo
f1417210fa Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-11 13:56:40 -06:00
Alexander Bock
83cbe7f891 Print parsing errors in openspace.cfg 2017-07-11 15:17:11 -04:00
Alexander Bock
6d0c80cc91 Change the mouse scroll callback to accept two dimensional arguments 2017-07-11 14:35:39 -04:00
Alexander Bock
55589c8487 Merge remote-tracking branch 'origin/master' 2017-07-11 14:23:29 -04:00
Alexander Bock
314c6c0848 Enable Property to have multiple callbacks 2017-07-11 14:23:17 -04:00
Matthew Territo
85eb00c022 Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-11 12:07:06 -06:00
Alexander Bock
9258c9f858 Update Kameleon submodule 2017-07-11 13:34:50 -04:00
Alexander Bock
6ebf4495f6 Update README.md
Add links to Readme
2017-07-10 19:09:36 -04:00
Alexander Bock
37055c69a9 Update README.md
Add Slack channel
2017-07-10 19:04:45 -04:00
Alexander Bock
b1171fdea9 Merge remote-tracking branch 'origin/master' 2017-07-10 15:08:08 -04:00
Matthew Territo
637dd28835 Merge pull request #356 from OpenSpace/issue355
Replace ${SGCT} token with ${CONFIG} in Launcher and OpenSpaceEngine.
2017-07-10 12:49:43 -06:00
Kalle Bladin
4f903ac030 Feature/globebrowsing (#334)
Layer support for globe browsing:

Add layers using the function openspace.globebrowsing.addLayer
Delete layers using openspace.globebrowsing.deleteLayer
Layer type does not necessarily have to be of tile type. For example solidcolor does not use tiles
Blend modes for layers are Normal, Add, Subtract, Multiply, Color
Layer adjustments to affect layers. The current only active one is chroma key to cut out a color from the layer. Transfer functions or clipping masks are examples of layer adjustments for the future.
Support for adding layer specifications for quickly accessing GIBS layers:
openspace.globebrowsing.createGibsGdalXml
openspace.globebrowsing.createTemporalGibsGdalXml
The arguments for these functions are currently strings. Would it be better to use a lua dictionary?
No data values for height layers are correctly regarded (can be seen on Earth. No longer bumps on the poles)
Other minor things:

Worked a bit on point globe to render globes at large distances. Currently not in use and doesn't have anything to do with the other things.
Concurrent job manager takes a thread pool as argument and not a pointer to one. This is because the concurrent job manager needs to have ownership of the thread pool for correct deinitialization. Will cause breaking change for users of concurrent job manager if merged in to master.


* Add ability to add layers programatically.

* Clean up

* Fix order of deletion in concurrent job manager and clean up

* Can create by level tile provider with empty dictionary.

* Add script to add GIBS datasets.

* Start working with layer adjustment

* Update mod files

* More work on point globe

* Add script to create temporal GIBS datasets.

* Update temporal tile provider to be able to take gdal descriptions without file path.

* Add adjustment property to layers.

* Rename adjustment layer

* Add adjustment code to all layer groups

* Remove caching of gdal datasets due to cluttering of folders

* Document layer support

* Update Mars mod

* Make Mercury great again.

* Cleanup and add blend mode Color

* Enable setting of layeradjustment and blend mode from mod files.

* No more use for grayscale color overlays. Use grayscale layer with color blend mode instead.

* Clean up mod files

* Clean up

* Clean up

* No need for grayscale layers. Reading grayscale in to rgb instead for color layers.

* Remove unused layer groups

* Correctly read to grayscale layers

* Update globe mod files

* Rename ColorOverlays to Overlays.

* Clean up

* Clean up

* Solve compilation error
2017-07-10 20:34:39 +02:00
Matthew Territo
84547397a7 Remove trailing spaces 2017-07-10 12:31:38 -06:00
Matthew Territo
a82c873927 Adds ${LOGS} path token and LogDir attribute 2017-07-10 12:30:08 -06:00
Matthew Territo
00ef5b2fd3 Add .gitignore-ed, empty logs directory. 2017-07-10 12:10:01 -06:00
Matthew Territo
2d1661679c Replace ${SGCT} token with ${CONFIG} in Launcher and OpenSpaceEngine. 2017-07-10 11:53:15 -06:00
Alexander Bock
23a97e982b Remove the SIMD project and thus remove the dependency on NASM 2017-07-10 13:48:00 -04:00
Matthew Territo
6bbb90a78a Merge branch 'master' into feature/statlogs
* master:
  Make console work with Fisheye rendering
  Correctly position Screenspace renderable if a scene tag is specified
  Move SGCT config files into main config folder and remove unused transferfunctions
  Increasing warning level
2017-07-09 23:16:32 -06:00
Alexander Bock
1cf53d5479 Make console work with Fisheye rendering 2017-07-08 17:11:50 -04:00
Alexander Bock
3520e42097 Correctly position Screenspace renderable if a scene tag is specified 2017-07-08 16:30:19 -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
Matthew Territo
f1d468dd3a Appending to logs now instead of overwriting :-/ 2017-07-07 12:52:55 -06:00
Matthew Territo
29fd158ed5 Create BoolProperty for PerformanceComponent 2017-07-07 12:33:49 -06:00
Matthew Territo
115bb998c9 Remove colons and cat filename together with formatLogName. 2017-07-07 10:44:16 -06:00
Matthew Territo
a165af8c59 Output to files. Function files aren't writing for some reason. 2017-07-06 18:34:38 -06:00
Matthew Territo
a91e48efe7 Add PerformanceMeasurement logging variables to ConfigurationManager. Read from logDir and file prefix from config file in PerformanceManager. 2017-07-06 17:01:21 -06:00
Matthew Territo
810c2ec493 Enable PerformanceManager logging with ImGui checkbox. 2017-07-06 12:07:50 -06:00
Matthew Territo
9015a8dad9 Example of access to invidvidual performance statistics 2017-07-05 15:31:09 -06:00
Matthew Territo
da3b8052ab Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-05 11:33:05 -06:00
Matthew Territo
1d9bb740f2 Some clarification & iteration fixes. 2017-07-03 14:43:18 -06:00
Matthew Territo
81164e0d8d Stub for Performance Manager & GUI Button 2017-07-03 13:46:17 -06:00
Alexander Bock
de84bd0761 Fix OpenGL compile error 2017-07-03 11:58:58 -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
cfdeea31ae Compile fix in Pixelbuffer 2017-07-03 11:20:31 -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
a65eba4d93 Merge branch 'master' into feature/cpp17-update 2017-07-01 17:54:43 -04:00