diff --git a/modules/you_done_it/client_node.h b/modules/you_done_it/client_node.h index 649ea14a..60c67762 100644 --- a/modules/you_done_it/client_node.h +++ b/modules/you_done_it/client_node.h @@ -3,7 +3,7 @@ #include "scene/main/node.h" #include "you_done_it/ydi_networking.h" -class ClientNode : Node { +class ClientNode : public Node { GDCLASS(ClientNode, Node); static ClientNode *singleton_instance; static void _bind_methods(); diff --git a/modules/you_done_it/photo_inbox.cpp b/modules/you_done_it/photo_inbox.cpp index 9e1039f3..fe5d3969 100644 --- a/modules/you_done_it/photo_inbox.cpp +++ b/modules/you_done_it/photo_inbox.cpp @@ -27,14 +27,6 @@ void PhotoInbox::unhandled_input(Ref const &event) { switch (key->get_key_label()) { default: break; - case Key::KEY_1: - on_clue_revealed(NetworkData::CLUE_FIRST); - get_viewport()->set_input_as_handled(); - break; - case Key::KEY_2: - on_clue_revealed(NetworkData::CLUE_SECOND); - get_viewport()->set_input_as_handled(); - break; } } } diff --git a/modules/you_done_it/server_node.cpp b/modules/you_done_it/server_node.cpp index c3f90b34..b1536cf9 100644 --- a/modules/you_done_it/server_node.cpp +++ b/modules/you_done_it/server_node.cpp @@ -6,11 +6,16 @@ ServerNode *ServerNode::singleton_instance{ nullptr }; String const ServerNode::sig_clue_revealed{ "clue_revealed" }; String const ServerNode::sig_connection_established{ "connection_established" }; String const ServerNode::sig_connection_lost{ "connection_lost" }; +String const ServerNode::sig_conclusion_sent{ "conclusion_sent" }; void ServerNode::_bind_methods() { ADD_SIGNAL(MethodInfo(sig_clue_revealed, PropertyInfo(Variant::INT, "id"))); ADD_SIGNAL(MethodInfo(sig_connection_established)); ADD_SIGNAL(MethodInfo(sig_connection_lost)); + ADD_SIGNAL(MethodInfo(sig_conclusion_sent, + PropertyInfo(Variant::INT, "method", PROPERTY_HINT_ENUM, NetworkData::ClueID_hint()), + PropertyInfo(Variant::INT, "motive", PROPERTY_HINT_ENUM, NetworkData::ClueID_hint()), + PropertyInfo(Variant::INT, "murderer", PROPERTY_HINT_ENUM, NetworkData::ClueID_hint()))); ClassDB::bind_method(D_METHOD("open"), &self_type::open); ClassDB::bind_method(D_METHOD("close"), &self_type::close); diff --git a/modules/you_done_it/server_node.h b/modules/you_done_it/server_node.h index 06e58f7f..2719c6a6 100644 --- a/modules/you_done_it/server_node.h +++ b/modules/you_done_it/server_node.h @@ -25,6 +25,7 @@ public: static String const sig_clue_revealed; static String const sig_connection_established; static String const sig_connection_lost; + static String const sig_conclusion_sent; private: bool is_connected{ false }; diff --git a/modules/you_done_it/ydi_networking.cpp b/modules/you_done_it/ydi_networking.cpp index bba15f32..85c5ae21 100644 --- a/modules/you_done_it/ydi_networking.cpp +++ b/modules/you_done_it/ydi_networking.cpp @@ -4,8 +4,17 @@ #include "core/string/print_string.h" void NetworkData::_bind_methods() { - BIND_ENUM_CONSTANT(CLUE_FIRST); - BIND_ENUM_CONSTANT(CLUE_SECOND); + BIND_ENUM_CONSTANT(CLUE_STAPLER); + BIND_ENUM_CONSTANT(CLUE_VICTIM_BLOOD); + BIND_ENUM_CONSTANT(CLUE_MURDERER_BLOOD); + BIND_ENUM_CONSTANT(CLUE_KNIFE); + BIND_ENUM_CONSTANT(CLUE_APPLE); + BIND_ENUM_CONSTANT(CLUE_FOLDER); + BIND_ENUM_CONSTANT(CLUE_FOOT_PRINTS); + BIND_ENUM_CONSTANT(CLUE_BUSINESS_CARD); + BIND_ENUM_CONSTANT(CLUE_SIGNED_DOCUMENT); + BIND_ENUM_CONSTANT(CLUE_FINGERPRINT); + BIND_ENUM_CONSTANT(CLUE_HAIR); BIND_ENUM_CONSTANT(CLUE_MAX); BIND_ENUM_CONSTANT(CONNECTION_DISCONNECTED); diff --git a/modules/you_done_it/ydi_networking.h b/modules/you_done_it/ydi_networking.h index 22241008..4370e8e7 100644 --- a/modules/you_done_it/ydi_networking.h +++ b/modules/you_done_it/ydi_networking.h @@ -8,7 +8,7 @@ #include #include -class NetworkData : Object { +class NetworkData : public Object { GDCLASS(NetworkData, Object); static void _bind_methods(); @@ -28,8 +28,17 @@ public: MSG_INVALID); GDENUM(ClueID, - CLUE_FIRST, - CLUE_SECOND, + CLUE_STAPLER, + CLUE_VICTIM_BLOOD, + CLUE_MURDERER_BLOOD, + CLUE_KNIFE, + CLUE_APPLE, + CLUE_FOLDER, + CLUE_FOOT_PRINTS, + CLUE_BUSINESS_CARD, + CLUE_SIGNED_DOCUMENT, + CLUE_FINGERPRINT, + CLUE_HAIR, CLUE_MAX); GDENUM(ConnectionStatus, diff --git a/vr-project/UI elements/Case_Button.png b/vr-project/UI elements/Case_Button.png new file mode 100644 index 00000000..13d08489 Binary files /dev/null and b/vr-project/UI elements/Case_Button.png differ diff --git a/vr-project/UI elements/ChooseKiller_Button.png b/vr-project/UI elements/ChooseKiller_Button.png new file mode 100644 index 00000000..121cd063 Binary files /dev/null and b/vr-project/UI elements/ChooseKiller_Button.png differ diff --git a/vr-project/UI elements/Clock.png b/vr-project/UI elements/Clock.png new file mode 100644 index 00000000..0297c7e8 Binary files /dev/null and b/vr-project/UI elements/Clock.png differ diff --git a/vr-project/UI elements/Clock_Pointer.png b/vr-project/UI elements/Clock_Pointer.png new file mode 100644 index 00000000..fc0d4714 Binary files /dev/null and b/vr-project/UI elements/Clock_Pointer.png differ diff --git a/vr-project/UI elements/Clock_Pointer_Little.png b/vr-project/UI elements/Clock_Pointer_Little.png new file mode 100644 index 00000000..2fad5748 Binary files /dev/null and b/vr-project/UI elements/Clock_Pointer_Little.png differ diff --git a/vr-project/UI elements/Dele_Button.png b/vr-project/UI elements/Dele_Button.png new file mode 100644 index 00000000..6beeb499 Binary files /dev/null and b/vr-project/UI elements/Dele_Button.png differ diff --git a/vr-project/UI elements/Envelope_Back.png b/vr-project/UI elements/Envelope_Back.png new file mode 100644 index 00000000..a2924931 Binary files /dev/null and b/vr-project/UI elements/Envelope_Back.png differ diff --git a/vr-project/UI elements/Envelope_Front.png b/vr-project/UI elements/Envelope_Front.png new file mode 100644 index 00000000..953bacc4 Binary files /dev/null and b/vr-project/UI elements/Envelope_Front.png differ diff --git a/vr-project/UI elements/Left_Button.png b/vr-project/UI elements/Left_Button.png new file mode 100644 index 00000000..0484bf8c Binary files /dev/null and b/vr-project/UI elements/Left_Button.png differ diff --git a/vr-project/UI elements/Murder_Suspect_File.png b/vr-project/UI elements/Murder_Suspect_File.png new file mode 100644 index 00000000..aceb274c Binary files /dev/null and b/vr-project/UI elements/Murder_Suspect_File.png differ diff --git a/vr-project/UI elements/Paperclip.png b/vr-project/UI elements/Paperclip.png new file mode 100644 index 00000000..1d5d9045 Binary files /dev/null and b/vr-project/UI elements/Paperclip.png differ diff --git a/vr-project/UI elements/Pin_Board.png b/vr-project/UI elements/Pin_Board.png new file mode 100644 index 00000000..67c369e8 Binary files /dev/null and b/vr-project/UI elements/Pin_Board.png differ diff --git a/vr-project/UI elements/Right_Button.png b/vr-project/UI elements/Right_Button.png new file mode 100644 index 00000000..420614f4 Binary files /dev/null and b/vr-project/UI elements/Right_Button.png differ diff --git a/vr-project/UI elements/Save Photo_Button.png b/vr-project/UI elements/Save Photo_Button.png new file mode 100644 index 00000000..9e1ed300 Binary files /dev/null and b/vr-project/UI elements/Save Photo_Button.png differ diff --git a/vr-project/UI elements/Send_Button.png b/vr-project/UI elements/Send_Button.png new file mode 100644 index 00000000..30e02230 Binary files /dev/null and b/vr-project/UI elements/Send_Button.png differ diff --git a/vr-project/UI elements/Victim_Button.png b/vr-project/UI elements/Victim_Button.png new file mode 100644 index 00000000..5c4a5043 Binary files /dev/null and b/vr-project/UI elements/Victim_Button.png differ diff --git a/vr-project/UI elements/Witness_Button.png b/vr-project/UI elements/Witness_Button.png new file mode 100644 index 00000000..dd218e15 Binary files /dev/null and b/vr-project/UI elements/Witness_Button.png differ diff --git a/vr-project/UI elements/X_Button.png b/vr-project/UI elements/X_Button.png new file mode 100644 index 00000000..91d0ad5e Binary files /dev/null and b/vr-project/UI elements/X_Button.png differ