Commit Graph

575 Commits

Author SHA1 Message Date
Joakim Kilby 9a74bd60b7 renamed osparallelconnection to parallel connection. Updated all files and CMakeLists to use new name.
started rebase work on parallel connection
2015-06-24 11:23:36 +02:00
Joakim Kilby b6bd205304 Added init request handling for non-hosts
osparallelconnection is no longer a property owner
2015-06-23 11:33:20 +02:00
Joakim Kilby fabbd3c1e8 added a vector containing all executed scripts for this session and method to get it.
added a call to sending of scripts via parallel connection as soon as they are executed.
2015-06-23 09:34:34 +02:00
Joakim Kilby b2b7563018 added functionality to send and decode scripts 2015-06-23 09:33:09 +02:00
Joakim Kilby b723751c1b added functionality to disconnect and request hostship via LUA.
fixed bug in threading
2015-06-18 09:10:15 +02:00
Joakim Kilby e42d160773 added interpolation and mutex protection
changed TCP protocol to no delay
2015-06-17 15:11:34 +02:00
Joakim Kilby 8297f2e683 First test of actual remote controlling 2015-06-17 13:10:19 +02:00
Joakim Kilby 4e4cf4cd6a temporarily removed references to keyframes in interactionhandler.
changed how keyframes are encoded/decoded and sent in osparallelconnection
2015-06-17 11:18:50 +02:00
Joakim Kilby 9d6b9a3ad1 adding first version of keyframe functionality for interactionhandler 2015-06-17 09:52:12 +02:00
Joakim Kilby 74ab05ec37 rename of mutex 2015-06-17 08:39:49 +02:00
Joakim Kilby 91247d4ac9 added keyframe struct and functionality to broadcast keyframes 2015-06-17 08:39:34 +02:00
Joakim Kilby cce351af69 removed all references to remotecontroller 2015-06-17 08:39:02 +02:00
Joakim Kilby f35ec6f8d4 Removed remotecontroller class 2015-06-17 08:38:25 +02:00
Joakim Kilby 8da76f6d1e added message specific decoding functions 2015-06-16 16:37:07 +02:00
Joakim Kilby 8f05d64316 added lua scripting functionality and fixed authentication to server 2015-06-16 15:45:00 +02:00
Joakim Kilby 2d3ef442fb adding parallelconnection 2015-06-16 13:56:34 +02:00
Joakim Kilby 61934f824b Merge branch 'develop' into feature/remote 2015-06-12 10:47:41 +02:00
Alexander Bock 17498c28c6 Minor cleanups 2015-06-05 01:45:15 +02:00
Joakim Kilby 1bcf11412e adding remotecontroller class, changes to CMake to include it and (temporary) functionality to use it, should be declared in CFG file 2015-06-04 12:53:32 +02:00
Michal Marcinkowski 7492fa2f6c New Additions:
Shadow cylinders extending from planet terminator in opposite dir of sun
Plane that displays the global texture map of a planet as projections appear
^latter is an addition to RenderablePlane class, a renderable plane can have
boolean keyword "ProjectionListener" - determines whether or not it displays
2015-06-03 19:10:34 -04:00
Alexander Bock 8ad7702b75 Automatically detect which rendering method to use based on the available OpenGL version 2015-06-03 13:31:42 +02:00
Alexander Bock 37a54ab22b Move specification of RenderingMethod into renderengine 2015-05-28 20:44:12 +02:00
Alexander Bock fc3faab5f1 Replace commandline argument with automatically detecting the supported OpenGL version 2015-05-28 20:33:22 +02:00
Alexander Bock 9d733eb613 Moving Kameleon into its own module
Moving fieldline rendering into its own module
2015-05-26 23:51:15 +02:00
Alexander Bock 77cc5dba49 Moving onscreen gui into its own module 2015-05-26 22:52:12 +02:00
Alexander Bock 4dddafcec9 Fixing more memory leaks 2015-05-26 21:44:49 +02:00
Alexander Bock fd0501d61c Defined default constructor for RenderData 2015-05-24 14:30:18 +02:00
Alexander Bock 98024ca29d Remove warnings 2015-05-24 00:09:52 +02:00
Alexander Bock f1e6ad6f3d Remove more warnings 2015-05-23 22:42:51 +02:00
Alexander Bock 433d0ba3a6 Fixing CMake for Mac OS 2015-05-23 19:50:03 +02:00
Alexander Bock f2a7ea9630 Fixing compile warning 2015-05-23 01:39:23 +02:00
Alexander Bock fc4a6b68fb Remove static version.h and replace by autogenerated file 2015-05-22 11:33:45 +02:00
Alexander Bock ca7dcd4762 Move shaders into their correct modules
Add path determination to modules that automatically sets correct path resolve tokens
2015-05-21 15:17:38 +02:00
Alexander Bock e51df4b2a0 Sorting more classes into the correct modules 2015-05-20 21:40:52 +02:00
Alexander Bock 523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Alexander Bock fdead75cfa Remove move values from constants.h
Disable ghosting in ephemeris to remove dependency on imagesequencer
2015-05-20 17:42:47 +02:00
Alexander Bock 4de4c015d7 Starting to clean out constants.h file by moving constants into the relevant classes 2015-05-20 16:32:28 +02:00
Alexander Bock b8cd01ea4e Removing ghosting from renderablemodel
Organizing shaders
2015-05-20 11:18:14 +02:00
Alexander Bock 18752b9d8b Remove individual dirty flags for ProgramObjects and replace with new Ghoul version
Moved projectiveTexture shader into modules directory
2015-05-20 10:33:36 +02:00
Anton Arbring 75c268db08 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/rendering/renderengine.cpp
2015-05-19 12:00:02 -04:00
Alexander Bock 683ce14449 Various cleanups in main.cpp
Adapted to new Ghoul version
2015-05-19 13:58:00 +02:00
Alexander Bock 9e02d35d8a Fix spelling errors in method names 2015-05-19 01:13:53 +02:00
Alexander Bock 8860a1cd1f Remove vao, vbo and ibo property declarations from simplespheregeometryprojection class 2015-05-19 01:09:57 +02:00
Alexander Bock dc665639d5 Fixed crash with ABufferFixed implementation 2015-05-19 01:05:19 +02:00
Alexander Bock 02dbe8c2b3 Renamed abufferSingleLinked files to abuffersinglelinked for capitalization conformance 2015-05-19 00:53:11 +02:00
Alexander Bock abdd1af2a9 Cleaning up abuffer classes
Make ABuffer type selectable in openspace.cfg
2015-05-19 00:47:47 +02:00
Anton Arbring 30dfc77d81 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablecrawlingline.cpp
	src/rendering/renderableplaneprojection.cpp
2015-05-13 16:44:03 -04:00
Anton Arbring a0042ef219 More last minute fixes
Fixed plane bug (again)
changed rex animation (again)
More key binds
etc
2015-05-13 16:15:50 -04:00
Michal Marcinkowski 1369e5caf5 adding capability to clear images on the fly
- (rest will be done on antons machine)
2015-05-13 15:19:41 -04:00
Alexander Bock 9366fd4b80 More clang fixes 2015-05-13 19:48:41 +02:00