mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-09 05:00:42 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,925 Commits 87 Branches 46 Tags
07dfafeddbd9750ea193a5f400fd1e298cf16ec1
Commit Graph

753 Commits

Author SHA1 Message Date
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
a21c9538b6 Untabify more files 2016-04-18 15:15:30 +02:00
Alexander Bock
4936a4a084 Remove sgct.h inclusion from LuaConsole 
Untabify more files
 2016-04-18 11:12:12 +02:00
Alexander Bock
46b207b379 Removing some cppcheck warnings 2016-04-14 22:49:03 -04:00
Alexander Bock
b43a454e9f Fix GCC compiler warnings 2016-04-14 22:40:25 -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
Sebastian Piwell
fa3fc8dc87 Transfer function to dataplan and ColorBar 2016-04-13 11:36:43 -04:00
Emil Axelsson
48bd41ad9f merge in changes from develop 2016-04-12 16:29:35 +02:00
Emil Axelsson
4ff0205eae bring in support for multiresolution volume rendering 2016-04-11 16:56:44 +02:00
Sebastian Piwell
a55d5e9e9a Put ISWACygnets in sceneGraph 2016-04-08 15:42:24 -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
20c1fa0cfa Compile fix for Linux, included string 2016-04-08 10:47:59 -04: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
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
Michael Nilsson
49d8319938 merge with develop 2016-04-05 12:02:25 -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
Sebastian Piwell
e729723b06 Merge with feature/screenspacerenderable 2016-03-31 15:58:54 -04:00
Sebastian Piwell
d610171441 for simple testing 2016-03-31 15:54:29 -04:00
Sebastian Piwell
79979fe8dd Clean up 2016-03-31 14:53:42 -04:00
Michael Nilsson
ba57bd4cf8 solve merge conflict 2016-03-31 09:50:50 -04:00
Sebastian Piwell
c935ce6fe0 renamed module dataplane to iswa 2016-03-30 15:27:31 -04:00
Michael Nilsson
e09ed7594e Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage 2016-03-30 09:52:01 -04:00
Michael Nilsson
d390a70fb6 solve merge conflict 2016-03-30 09:51:34 -04:00
Michael Nilsson
3e7249157c add some documentation 2016-03-30 09:17:49 -04:00
Michael Nilsson
5911149273 downloadmanager load to string. update texture function to renderabletextureplane 2016-03-23 16:57:25 -04:00
Emil Axelsson
80fe89dbc8 change interfaces from pointer to reference 2016-03-23 14:00:40 +01:00
Emil Axelsson
a44eed992f Merge remote-tracking branch 'origin/feature/volumerendering' into develop 2016-03-21 18:55:32 +01:00
Emil Axelsson
ebe10a29b5 Volume rendering compatible with abuffer and framebuffer renderers 2016-03-21 16:40:24 +01:00
Sebastian Piwell
48978f38fc removed mouseinteraction test for screenspacerenderables 2016-03-21 09:20:47 -04:00
Sebastian Piwell
48021a46e2 Sort screenspacerenderables in correct render order 2016-03-18 12:02:46 -04:00
Michael Nilsson
5553ec02c9 solved merge conflict 2016-03-18 10:35:40 -04:00
Michael Nilsson
70d7d3c82a add alpha property to screenspacerenderable 2016-03-18 10:33:34 -04:00
Sebastian Piwell
8bc736acec Add render functions to screenspaceframebuffer 2016-03-17 17:52:07 -04:00
Michael Nilsson
4b6b34cd74 added test case for screenspaceimage 2016-03-17 17:45:27 -04:00
Sebastian Piwell
ac40c0a7d6 Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage 2016-03-17 15:38:36 -04:00
Sebastian Piwell
31f1e91b06 Tests for screenSpaceFramebuffer 2016-03-17 15:38:21 -04:00
Michael Nilsson
e8175ee54c solved merge conflict, fix for close(socket) in paralellconnection 2016-03-17 14:41:05 -04:00
Sebastian Piwell
171aa46150 Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage 
Conflicts:
	include/openspace/rendering/screenspacerenderable.h
	modules/base/rendering/screenspaceimage.cpp
	src/rendering/screenspacerenderable.cpp
 2016-03-16 17:42:13 -04:00
Sebastian Piwell
0f963ee3b8 Created screenspaceframebuffer 2016-03-16 17:27:10 -04:00
Michael Nilsson
5a0ee0bc7a add math.h to screenspacerenderables for M_PI, windows only 2016-03-16 17:21:54 -04:00