Commit Graph

54 Commits

Author SHA1 Message Date
Emma Broman
ec2224f63f Create Scene Graph Nodes through the scriptEngine 2021-02-01 17:10:37 +01:00
Emma Broman
8fb955ab85 Opacity fix and some cleanup 2021-02-01 17:10:16 +01:00
Emma Broman
09768054e9 Update to new dictionary 2021-01-29 14:15:37 +01:00
aniisaaden
d2f5076977 Updated format of global::renderengine to pointers 2020-10-22 18:04:31 +02:00
aniisaaden
7b1ae50918 Fixed opacity issue 2020-10-22 17:38:34 +02:00
aniisaaden
1460d30a21 Cleaned and structured code 2020-10-20 09:48:35 +02:00
aniisaaden
7f7b0bca9b Removed Info-message of data received - too long 2020-10-19 17:27:25 +02:00
aniisaaden
e4b48f6149 Added extra LINFO for messages received 2020-10-19 16:01:18 +02:00
aniisaaden
e109c64081 Fixed issue with pointscloud asset. Changed pointData to be a dictionary in pointsCloudRenderable. Changed name of message type "DATA" to "PDAT" 2020-10-19 13:52:47 +02:00
aniisaaden
12ad26d51e Changed LERROR-messages to LINFO-messages 2020-10-16 14:42:45 +02:00
aniisaaden
b6b16df51c Remove scenegraphnode works again 2020-10-15 15:14:25 +02:00
aniisaaden
cf8888485b Changes focus-node to the sun in case the focus-node is a sgn being removed 2020-10-15 14:59:10 +02:00
aniisaaden
273b3bca0c Camera retargets and focuses on pointdatas sgn - resets the camera state when removing sgn 2020-10-14 18:04:39 +02:00
Johanna Granström
58261ece73 Merge branch 'thesis/2020/software-integration' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
# Conflicts:
#	modules/softwareintegration/softwareintegrationmodule.cpp
2020-10-14 13:36:43 +02:00
Johanna Granström
ba683f980e Fixed: Exception error 2020-10-14 11:48:20 +02:00
aniisaaden
b2e837dc5f Camera retargets and focuses on pointdatas sgn - does not reset the camera state when removing sgn 2020-10-13 15:33:43 +02:00
aniisaaden
07ad1ddb00 Expanded the module to include luminosity and velocity data 2020-10-13 11:41:13 +02:00
aniisaaden
c428f097ea Started expanding the module and renderable to include luminosity and velocity 2020-10-13 10:15:09 +02:00
aniisaaden
1e15aba4ce Debugging code to see what messages are sent and recieved 2020-10-09 16:17:30 +02:00
aniisaaden
064a01281b Point data has correct postion in OpenSpace. Speckfile code removed from module and renderable. 2020-10-08 15:02:32 +02:00
aniisaaden
c71465f507 Added if-statements for onChange-messaging. Renderable updated to receive point data, position is wrong. 2020-10-08 14:20:05 +02:00
aniisaaden
779dfb88a9 OpenSpace can receive data from Glue as a long string, then read the data and separate x,y,z-coordinates into vectors 2020-09-28 16:53:51 +02:00
aniisaaden
1a46847c82 Code clean up 2020-09-23 15:56:21 +02:00
aniisaaden
9eb33f6775 Toggling visibility of SGN works from Glue and from OpenSpace 2020-09-22 15:33:44 +02:00
aniisaaden
6cd82e8e8a Opacity & Size message types added 2020-09-22 14:51:27 +02:00
aniisaaden
424e99ebed OpenSpace and Glue can both send and receive messages, and update their properties. 2020-09-18 13:39:41 +02:00
aniisaaden
3282dc80b2 Softwareintegrationmodule and Softwareconnection are two separte files. 2020-09-18 11:53:17 +02:00
johannagranstroem
17f41e0405 Space added 2020-09-17 17:35:02 +02:00
johannagranstrom
29a42e2c55 Started the process of creating a callback in our module for property changes in our renderable 2020-09-17 17:04:51 +02:00
aniisaaden
b0403489ac Implemented messaging prototype for OpenSpace sending updated property values - work in progress 2020-09-16 16:02:56 +02:00
aniisaaden
0407e8df7d Opacity bug fixed & removescenegraphnode functionality added 2020-09-16 11:13:04 +02:00
aniisaaden
4b8f1027fd Updated comments 2020-09-15 15:50:15 +02:00
aniisaaden
66b790e941 Renderable properties can be updated from Glue if identifier is given 2020-09-15 15:03:02 +02:00
aniisaaden
465b377515 Went back to previous working version - commented out new changes for bug fixing 🐛 2020-09-15 11:15:48 +02:00
johannagranstrom
2df4c09422 Documentation specification error resolved 2020-08-12 13:59:32 +02:00
johannagranstrom
467d04b3ac OpenSpace is able to send a simple string message that Glue can receive and print. 2020-08-11 16:43:27 +02:00
aniisaaden
d181133581 Added functionality for creating a sgn from Glue message: Doesn't work but should work. 2020-08-11 15:03:33 +02:00
aniisaaden
cb4de51f11 Repetetive code turned into functions: readIdentifier, readFloatValue, readColor & readString 2020-08-10 16:50:38 +02:00
aniisaaden
f7349bdf02 Update opacity, color & size works. Added comments and shorten some code. 2020-08-10 15:49:54 +02:00
aniisaaden
33c339ed31 Color update 2020-08-07 14:38:05 +02:00
aniisaaden
3bacb31a8f Changed names of message types 2020-08-07 14:20:28 +02:00
aniisaaden
02c7ebcec3 Renamed Connection class to SoftwareConnection and added message type for adding a new scene graph. 2020-08-07 13:52:07 +02:00
aniisaaden
baf27037c7 Simple message structure added. Messages recieved includes a header with protocol version, message type, length of message and the message. OS can receive new values for color, opacity and size when the values change. 2020-08-05 16:55:28 +02:00
aniisaaden
65b68f7201 Can receive message from Glue, includes length of identifiers. 2020-08-04 18:41:19 +02:00
aniisaaden
5b77e66d2b Added message functions, can receive string message if message length is specified. 2020-08-04 12:13:03 +02:00
aniisaaden
e28c9278f2 Added tcpsocket server to module, can connect to Glue but not send/receive messages 2020-07-29 16:27:47 +02:00
aniisaaden
b0761a78c8 No error from pointscloud.asset, indention fix 2020-07-28 16:58:45 +02:00
johannagranstrom
a7efa3b6e6 Added Lua scripting 2020-07-27 14:41:45 +02:00
aniisaaden
f576eebe20 Created a basic point cloud renderable 2020-07-10 09:02:18 +02:00
aniisaaden
4f9713410d Merge conflict resolved 2020-07-09 10:31:53 +02:00