mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-06 19:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,321 Commits 84 Branches 46 Tags
b416f9fba2c06882b29188d8377484affaefffb0
Commit Graph

2321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Bock
b416f9fba2 Fix linking error in ScalarProperty with wchar_t 2016-06-17 11:28:32 +02:00
Alexander Bock
c253e5734f Add a todo to Launcher 
Update to newest Ghoul
 2016-06-16 22:37:55 +02:00
wundahful
66eb47ea95 Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into develop 2016-06-16 17:38:48 +02:00
Matthew Territo
415e3cf77a merging feature/globalSettings: adding script logging 2016-06-16 17:35:46 +02:00
Matthew Territo
f53b9228ab merging feature/globalSettings: adding script logging 
lease enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2016-06-16 17:27:25 +02:00
Matthew Territo
7189f85390 Removed LDEBUG logging per writeLog call 2016-06-16 17:22:24 +02:00
Matthew Territo
5925bd9c63 Added logging to the script engine and the associated properties in openspace.cfg table. Fixed comment for PropertyDocumentation in scene.cpp 2016-06-16 17:03:48 +02:00
Gene Payne
6f05594440 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-06-15 15:40:48 +02:00
Gene Payne
2eab8aee28 Fixed bug in global settings implementation 2016-06-15 15:38:16 +02:00
Gene Payne
d5ddaf84b8 Working on global settings integrated in gui but no functionality yet 2016-06-15 14:46:19 +02:00
Emil Axelsson
fa1bf5873f fix fisheye rendering bug 2016-06-15 10:41:47 +02:00
Alexander Bock
76a2f78676 Perform a glFinish at the beginning and the end of the performance measurement frame to capture all OpenGL timings 2016-06-15 09:30:22 +02:00
Alexander Bock
2dd29e5ecb Fixing bug with disappearing SGCT arguments 2016-06-14 09:19:11 +02:00
Emil Axelsson
73ceaafd13 merge 2016-06-08 15:02:10 +02:00
Emil Axelsson
8771a238d3 improve galaxy rendering 2016-06-08 15:00:03 +02:00
Alexander Bock
146b71e129 Make performance widget graphs fill from right to left instead of circular releases/v0.3.3 2016-06-07 11:16:27 +02:00
Alexander Bock
55456ae272 Add button to reset performance measurements 
Clang compile fix
 2016-06-06 10:23:28 +02:00
Alexander Bock
742bfcfe86 Remove static min/max values and compute scaling factors directly from data 2016-06-06 09:52:47 +02:00
Alexander Bock
16559231bd Move Performance ImGui components into separate windows 2016-06-06 09:01:15 +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
Alexander Bock
f8f89e6fd1 Moving more code into performance files 2016-06-06 02:12:46 +02:00
Alexander Bock
2c8e3fd7b9 Refactor PerformanceLayout into new file and reuse between RenderEngine and GuiPerformanceComponent 2016-06-06 01:54:41 +02:00
Alexander Bock
a0e5fe34fe Use more fine-grained texture specification for Pluto and Charon 2016-06-06 00:49:09 +02:00
Alexander Bock
e85144b4eb Performance optimization of ImageSequencer::instrumentActive 2016-06-06 00:45:40 +02:00
Alexander Bock
6a2624dbb2 Enable the sorting of performance measurement values 2016-06-05 23:27:24 +02:00
Alexander Bock
6a4362d6ed Make OpenSpace not crash on a fault rebuild of shaders 2016-06-05 18:52:00 +02:00
Alexander Bock
25b49e882d Automatically remove placeholder.png for the projection cases where a real image is available 2016-06-05 16:11:06 +02:00
Alexander Bock
9a3818f007 ProjectionComponent always loads the placeholder textures and reuses it 2016-06-04 20:58:58 +02:00
Alexander Bock
ef75066478 Rename projection shaders to more sensible names 2016-06-04 20:42:10 +02:00
Alexander Bock
3d82173ff0 Don't set alpha value to 1.0 for all projection images 2016-06-04 20:33:17 +02:00
Alexander Bock
6362318399 Make textured milkyway show again 2016-06-04 20:17:28 +02:00
Alexander Bock
50e0c1a43b Reset Earth as camera focus 2016-06-04 20:03:16 +02:00
Alexander Bock
fe9a97fc80 Fix GLSL compile error 2016-06-04 19:56:29 +02:00
Alexander Bock
c6dc426211 Merge remote-tracking branch 'origin/feature/galaxy' into develop 
Conflicts:
	data/scene/default.scene
	shaders/PowerScaling/powerScalingMath.hglsl
 2016-06-04 19:54:34 +02:00
Alexander Bock
36f5f7bb04 Only load cdf list if ISWA module is loaded 2016-06-04 19:39:22 +02:00
Alexander Bock
30264fb00e Add Lua function to check whether a specific module is loaded (closing #36) 2016-06-04 19:38:56 +02:00
Alexander Bock
4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop 
Conflicts:
	data/scene/default.scene
 2016-06-04 19:06:54 +02:00
Alexander Bock
2700ef6ea8 Moving potential targets into ProjectionComponent 2016-06-04 13:45:55 +02:00
Alexander Bock
afe2ecc1e8 Allow RenderEngine's removeRenderProgram method to reject passed nullptrs 2016-06-04 13:39:11 +02:00
Alexander Bock
4dda541d1f More work on refactoring RenderablePlanetProjection and RenderableModelProjection 2016-06-04 13:38:50 +02:00
Sebastian Piwell
4ae4ecca3c Auto filter at start 2016-06-03 14:16:15 -04:00
Sebastian Piwell
e3dae7abc3 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-03 13:43:01 -04:00
Sebastian Piwell
8e8d949107 Summer school release 2016-06-03 13:42:50 -04:00