Matthew Territo
|
6f65641290
|
Merge branch 'master' into feature/multiresvolume
* master: (44 commits)
Remove style guide errors Add missing newline errors
Update the Sun glare reference
Update OpenSpace version
Minor spelling, grammar, & comment cleanup
Cleanup of gitignore file Started work on fixing Rosetta
Jenkins compile fix
Touch module capitalization compile fix
Fix capitalization of includes
More shader cleanup Remove dedicated logs folder Change openspaceengine to create logs folder automatically
Renaming touch include files
Jenkins compile fix
Cleanup of shader code
Jenkins compile fix
Jenkins compile error
Jenkins compile fix Remove fresh recompile
Update Jenkinsfile to clean workspace
Cleanup copyright information in shaders
Second part of turning touch classes to lower case
First step of turning touch classes into lower case
Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&)
...
# Conflicts:
# modules/multiresvolume/rendering/localtfbrickselector.cpp
# modules/multiresvolume/rendering/localtfbrickselector.h
# modules/multiresvolume/rendering/renderablemultiresvolume.cpp
# modules/multiresvolume/rendering/renderablemultiresvolume.h
# modules/multiresvolume/rendering/shenbrickselector.h
# modules/multiresvolume/rendering/simpletfbrickselector.cpp
# modules/multiresvolume/rendering/simpletfbrickselector.h
# modules/multiresvolume/rendering/tfbrickselector.cpp
# modules/multiresvolume/rendering/tfbrickselector.h
# modules/multiresvolume/rendering/tsp.cpp
# src/performance/performancemanager.cpp
|
2017-07-24 11:54:50 -06:00 |
|
Matthew Territo
|
e6c9803dcc
|
Add updateSceneGraphNode measurement
|
2017-07-20 11:42:14 -06:00 |
|
Matthew Territo
|
e53a73f79f
|
Init headers in logging files. Clear logs each time outputLogs is enabled.
|
2017-07-19 23:15:15 -06:00 |
|
Matthew Territo
|
034bfda71d
|
Create clearLogs()
|
2017-07-19 19:39:30 -06:00 |
|
Matthew Territo
|
e810dcf5b2
|
Update _performanceRecord to store std::chrono::nanosecond duration instead of bare number
|
2017-07-19 16:36:18 -06:00 |
|
Alexander Bock
|
0e9edaeb12
|
Fix byte order mark commits
Update Ghoul
|
2017-07-17 15:54:00 -04:00 |
|
Alexander Bock
|
4dba552fd1
|
Started switching OpenSpace projects to nested namespaces
Various cleanups
|
2017-07-15 20:01:55 -04:00 |
|
Matthew Territo
|
9a9fcf0ac1
|
Alex's recommended changes in pull #357. Add check for log directory existence
and creation
|
2017-07-13 20:16:01 -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
|
81164e0d8d
|
Stub for Performance Manager & GUI Button
|
2017-07-03 13:46:17 -06:00 |
|
Alexander Bock
|
94e3e11188
|
Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
|
2017-02-06 18:02:01 -05:00 |
|
Alexander Bock
|
d139dd2d22
|
Clean include guards in OpenSpace core
Remove unused files
|
2016-12-09 13:54:22 +01:00 |
|
Alexander Bock
|
ed4b8c9fa8
|
Store Translation, Rotation, and Scaling Performance measurements
If no special sorting is requested in Performance GUI, sort by name
|
2016-10-28 12:52:54 +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
|
a2db1bed99
|
Include fixes for performance measurements
|
2016-07-18 16:25:55 +02:00 |
|
Alexander Bock
|
90d9f09909
|
Make PerformanceManager not crash if performance measurements are requested multiple times
|
2016-06-27 15:02:40 +02:00 |
|
Alexander Bock
|
146b71e129
|
Make performance widget graphs fill from right to left instead of circular
|
2016-06-07 11:16:27 +02:00 |
|
Alexander Bock
|
5a81b1089a
|
Rename PerformanceHelper to PerformanceMeasurement
Add performance measurements to FramebufferRenderer
|
2016-06-06 08:48:44 +02:00 |
|
Alexander Bock
|
6af96c4ef3
|
Add macro for easy generation of PerformanceHelper
|
2016-06-06 07:09:54 +02:00 |
|
Alexander Bock
|
55bd1341e6
|
More work on PerformanceHelper
Getting first version to run and produce output
|
2016-06-06 07:00:36 +02:00 |
|
Alexander Bock
|
ff0b916b90
|
Started implementing PerformanceHelper class
|
2016-06-06 03:53:42 +02:00 |
|
Alexander Bock
|
1430f6b9c2
|
Clang compile fix
|
2016-06-06 03:34:56 +02:00 |
|
Alexander Bock
|
14ee3af94d
|
Make PerformanceManager available
Add empty PerformanceHelper file
|
2016-06-06 03:30:10 +02:00 |
|
Alexander Bock
|
53c35c7531
|
Moving performance-related collection code from RenderEngine into new PerformanceManager code
|
2016-06-06 03:21:25 +02:00 |
|
Alexander Bock
|
55d484205a
|
Rename performance file
|
2016-06-06 02:14:42 +02:00 |
|