mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 13:38:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,971 Commits 83 Branches 46 Tags
434f8bfabb2033dcc32087dda307aa5bc479119d
Commit Graph

1269 Commits

Author SHA1 Message Date
Sebastian Piwell
434f8bfabb Some clean up and small fixes 2016-04-27 14:48:22 -04:00
Sebastian Piwell
b67180e325 Add transferFunction to dataplane 2016-04-27 14:47:06 -04:00
Sebastian Piwell
3fc25492f2 Read texture from memory with bare pointer 2016-04-25 11:26:15 -04:00
Sebastian Piwell
f13367e717 Kameleon plane 2016-04-25 10:37:06 -04:00
Sebastian Piwell
0246cd482e Solved merge conflict 2016-04-22 20:01:15 -04:00
Sebastian Piwell
f6bbce8b4c Add extension to futurefile 2016-04-22 17:39:45 -04:00
Michael Nilsson
3d3e59eabe solve merge conflict with develop 2016-04-20 16:38:41 -04:00
Michael Nilsson
c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Michael Nilsson
07dfafeddb solve merge conflict with develop 2016-04-20 15:03:51 -04:00
Michael Nilsson
a068ca2030 load cygnets through mod file 2016-04-20 09:47:20 -04:00
Alexander Bock
c14aa7b11b Fix inverted texture problem 
- Change texture indices of PowerScaledSphere
- Change texture generation in FBOBass for projections
- Updated NewHorizons to download unflipped texture
- Use new Ghoul version
 2016-04-20 14:28:11 +02:00
Alexander Bock
ea91d50b87 Start correcting fixes for wrong image origin 2016-04-20 13:07:01 +02:00
Alexander Bock
906470f28e Untabify the rest of the source files 
Update Ghoul repository
 2016-04-18 20:14:29 +02:00
Alexander Bock
6c6555bbce Print out the number of warnings, errors, and fatal errors that happened during initialization and each frame after 
Updated to new Ghoul version
 2016-04-18 16:44:44 +02:00
Alexander Bock
a21c9538b6 Untabify more files 2016-04-18 15:15:30 +02:00
Alexander Bock
c8da825098 Rename ImageSequencer2 to ImageSequencer 2016-04-18 15:14:59 +02:00
Alexander Bock
f0748505b7 Include VisualStudioOutputLog 
Correctly allow '/' character in SceneGraph description files
 2016-04-18 15:12:40 +02:00
Alexander Bock
4936a4a084 Remove sgct.h inclusion from LuaConsole 
Untabify more files
 2016-04-18 11:12:12 +02:00
Alexander Bock
04af38f546 Enable subdirectories by specifying an intermediate directory in the scene file 2016-04-15 10:27:41 -04:00
Alexander Bock
588bc74a88 Enable subdirectories for modules 
Move newhorizons scene modules into subdirectories
 2016-04-15 09:52:08 -04:00
Alexander Bock
46b207b379 Removing some cppcheck warnings 2016-04-14 22:49:03 -04:00
Alexander Bock
ef2981f535 Enable global variables for module Lua scripts (closing #172) 
Adapt New Horizons kernels to global switch between accurate and publicly avaiable kernels
 2016-04-14 22:33:28 -04:00
Alexander Bock
cf517f5309 Replacing CMake-based version setting with C++-based version 
Adding function to OpenSpace that returns the license header
 2016-04-14 10:27:59 -04:00
Alexander Bock
6b5681626b Removing clang-analyze warnings 2016-04-13 11:46:07 -04:00
Emil Axelsson
48bd41ad9f merge in changes from develop 2016-04-12 16:29:35 +02:00
Sebastian Piwell
a820d0a4dd Parse json to lua table string 2016-04-11 12:11:38 -04:00
Emil Axelsson
4ff0205eae bring in support for multiresolution volume rendering 2016-04-11 16:56:44 +02:00
Sebastian Piwell
6f582912f6 Update with ISWAManager 2016-04-08 16:10:53 -04:00
Sebastian Piwell
a55d5e9e9a Put ISWACygnets in sceneGraph 2016-04-08 15:42:24 -04:00
Sebastian Piwell
6a81065b42 ISWACygnet child of Renderable 2016-04-08 12:27:23 -04:00
Alexander Bock
352e7283d6 Enable the usage of modifiers in bindKey calls (closing #158) 2016-04-08 18:03:09 +02:00
Sebastian Piwell
cb10757b29 Merge branch 'feature/scenegraphmodification' into feature/iSWA 2016-04-08 10:23:44 -04:00
Alexander Bock
8d3c667ada Untabify InteractionHandler files 2016-04-08 15:13:21 +02:00
Alexander Bock
7c750ff2a2 Merge branch 'develop' into feature/newhorizons 2016-04-08 13:54:23 +02:00
Alexander Bock
8c354e5e37 Add Lua functions to add and remove SceneGraphNodes 2016-04-08 13:35:04 +02:00
Alexander Bock
21276f2cd8 Adding methods to add and remove scenegraphnodes from the scenegraph at runtime 2016-04-08 13:11:54 +02:00
Sebastian Piwell
bf61f6f1e4 Load and read textures from memory 2016-04-06 14:17:29 -04:00
Sebastian Piwell
7a0d880299 Works even if no iSWA module is created 2016-04-05 16:38:30 -04:00
Sebastian Piwell
b25453e368 Works without iSWA module enabled 2016-04-05 15:55:55 -04:00
Michael Nilsson
49d8319938 merge with develop 2016-04-05 12:02:25 -04:00
Sebastian Piwell
b1a009e1b0 Create ISWACygnets with metadata struct 2016-04-05 11:44:49 -04:00
Michael Nilsson
0d0f761d6e downloadmanager return shared_ptr to FileFutures instead of bare pointers 2016-04-05 11:33:58 -04:00
Sebastian Piwell
6f1b9a9fab Merge with screenspaceimage 2016-04-04 15:51:30 -04:00
Sebastian Piwell
453fbe300e Remove screenspacerenderables in any order 2016-04-04 15:40:45 -04:00
Sebastian Piwell
8e996f5bab Remove screenspacerenderables and iSWACygnets 2016-04-04 15:30:54 -04:00
Alexander Bock
019092e98e Correctly set child nodes for SceneGraphNode%s 2016-04-04 20:26:10 +02:00
Sebastian Piwell
3fbfb9bb33 Remove screenspacerenderables 2016-04-04 13:49:21 -04:00
Michael Nilsson
f4964b1628 request file extension 2016-04-01 16:32:18 -04:00
Emil Axelsson
90f3193236 Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into develop 2016-04-01 17:48:45 +02:00
Emil Axelsson
568a6a3416 fix bug when numberOfSamples is 0 2016-04-01 17:47:00 +02:00