970 Commits

Author	SHA1	Message	Date
Michael Nilsson	4d61694f75	ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory	2016-05-03 10:39:32 -04:00
Alexander Bock	20532d704f	Rename Lua functions to preInitialization and postInitialization ... Apply change to all scene files in the repository Remove default_settings and default_startup as their functoins have moved into the scene file	2016-04-30 14:18:08 +02:00
Sebastian Piwell	b67180e325	Add transferFunction to dataplane	2016-04-27 14:47:06 -04:00
Alexander Bock	75175512a8	First implementation of moving the startup scripts into the scene description files	2016-04-27 16:46:31 +02:00
Emil Axelsson	7db9bf0d98	start on experimental hybrid renderer	2016-04-26 10:20:54 +02: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	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
Kalle Bladin	aaa099d542	Solve conflict and fixed old code that did not run on OSX due to use of depricated shader functionality.	2016-04-18 23:05:19 -04:00
Kalle Bladin	ada97704f8	Solve compilation problems for OSX.	2016-04-18 22:44:20 -04:00
Erik Broberg	4073f4e6cb	Merged in branch develop to feature/globebrowsing	2016-04-18 20:02:42 -04:00
Alexander Bock	906470f28e	Untabify the rest of the source files ... Update Ghoul repository	2016-04-18 20:14:29 +02: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
Erik Broberg	3ec7badcf0	Camera: added convenience method for getting viewRotation and added inner class SyncData	2016-04-14 17:33:52 -04:00
Erik Broberg	299cd27f2c	Fixed bug Camera (view rot matrix had translation components) and structured Camera code	2016-04-14 12:47:12 -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
Karl Bladin	ff74f0794c	Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-04-04 12:12:19 -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
Erik Broberg	9d45463e93	Created class DistanceSwitch and added length() in double precision to PowerScaledCoordinate	2016-03-30 19:34:42 -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