Relintai/godot-lportal
1
0
Fork 0
mirror of https://github.com/Relintai/godot-lportal.git synced 2024-11-11 10:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dynamic lights work now if not a DOB

Browse Source
This commit is contained in:
lawnjelly 2020-04-02 12:08:42 +01:00 committed by GitHub
parent 6b74510611
commit 4bfe94b2b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lroom_manager.cpp
View File

@ -625,29 +625,28 @@ bool LRoomManager::DobTeleport(Spatial * pDOB, int iNewRoomID)
*/ */
// not tested... // not tested...
/*
bool LRoomManager::dob_teleport(Node * pDOB) bool LRoomManager::dob_teleport(Node * pDOB)
{ {
CHECK_ROOM_LIST CHECK_ROOM_LIST
return true; return true;
/*
Spatial * pSpat = Object::cast_to<Spatial>(pDOB); // Spatial * pSpat = Object::cast_to<Spatial>(pDOB);
if (!pSpat) // if (!pSpat)
return false; // return false;
Vector3 pt = pSpat->get_global_transform().origin; // Vector3 pt = pSpat->get_global_transform().origin;
int iRoomNum = FindClosestRoom(pt); // int iRoomNum = FindClosestRoom(pt);
//print_line("dob_teleport closest room " + itos(iRoomNum)); // //print_line("dob_teleport closest room " + itos(iRoomNum));
if (iRoomNum == -1) // if (iRoomNum == -1)
return false; // return false;
return DobTeleport(pSpat, iRoomNum); // return DobTeleport(pSpat, iRoomNum);
*/
} }
*/
bool LRoomManager::dob_unregister(int dob_id) bool LRoomManager::dob_unregister(int dob_id)
@ -935,7 +934,7 @@ int LRoomManager::dynamic_light_update(int light_id, const Vector3 &pos, const V
LLight &light = m_Lights[light_id]; LLight &light = m_Lights[light_id];
int iRoom = light.m_Source.m_RoomID; int iRoom = light.m_Source.m_RoomID;
if ((iRoom == -1) || (light.m_DOB_id == -1)) if (iRoom == -1)
{ {
WARN_PRINT_ONCE("dynamic_light_update : can't update global light"); WARN_PRINT_ONCE("dynamic_light_update : can't update global light");
return -1; return -1;
@ -945,8 +944,11 @@ int LRoomManager::dynamic_light_update(int light_id, const Vector3 &pos, const V
light.m_Source.m_ptDir = dir.normalized(); light.m_Source.m_ptDir = dir.normalized();
// update dob // update dob
int iNewRoom = m_DobList.UpdateDob(*this, light.m_DOB_id, pos); if (light.m_DOB_id != -1)
light.m_Source.m_RoomID = iNewRoom; {
int iNewRoom = m_DobList.UpdateDob(*this, light.m_DOB_id, pos);
light.m_Source.m_RoomID = iNewRoom;
}
// update with a new Trace (we are assuming update is only called if the light has moved) // update with a new Trace (we are assuming update is only called if the light has moved)
// remove the old local lights // remove the old local lights
@ -975,7 +977,7 @@ int LRoomManager::dynamic_light_update(int light_id, const Vector3 &pos, const V
} }
// this may or may not have changed // this may or may not have changed
return iNewRoom; return light.m_Source.m_RoomID;
/* /*
if (!pLightNode) if (!pLightNode)
@ -1094,7 +1096,7 @@ void LRoomManager::DebugString_Light_AffectedRooms(int light_id)
} }
bool LRoomManager::light_register(Node * pLightNode, String szArea) bool LRoomManager::global_light_register(Node * pLightNode, String szArea)
{ {
//CHECK_ROOM_LIST //CHECK_ROOM_LIST
@ -2216,7 +2218,7 @@ void LRoomManager::_bind_methods()
ClassDB::bind_method(D_METHOD("dob_register", "node", "pos", "radius"), &LRoomManager::dob_register); ClassDB::bind_method(D_METHOD("dob_register", "node", "pos", "radius"), &LRoomManager::dob_register);
ClassDB::bind_method(D_METHOD("dob_unregister", "dob_id"), &LRoomManager::dob_unregister); ClassDB::bind_method(D_METHOD("dob_unregister", "dob_id"), &LRoomManager::dob_unregister);
ClassDB::bind_method(D_METHOD("dob_update", "dob_id", "pos"), &LRoomManager::dob_update); ClassDB::bind_method(D_METHOD("dob_update", "dob_id", "pos"), &LRoomManager::dob_update);
ClassDB::bind_method(D_METHOD("dob_teleport", "dob"), &LRoomManager::dob_teleport); // ClassDB::bind_method(D_METHOD("dob_teleport", "dob"), &LRoomManager::dob_teleport);
// ClassDB::bind_method(D_METHOD("dob_register_hint", "dob", "radius", "room"), &LRoomManager::dob_register_hint); // ClassDB::bind_method(D_METHOD("dob_register_hint", "dob", "radius", "room"), &LRoomManager::dob_register_hint);
// ClassDB::bind_method(D_METHOD("dob_teleport_hint", "dob", "room"), &LRoomManager::dob_teleport_hint); // ClassDB::bind_method(D_METHOD("dob_teleport_hint", "dob", "room"), &LRoomManager::dob_teleport_hint);
@ -2224,7 +2226,7 @@ void LRoomManager::_bind_methods()
ClassDB::bind_method(D_METHOD("dob_get_room_id", "dob"), &LRoomManager::dob_get_room_id); ClassDB::bind_method(D_METHOD("dob_get_room_id", "dob"), &LRoomManager::dob_get_room_id);
ClassDB::bind_method(D_METHOD("light_register", "light", "area"), &LRoomManager::light_register); ClassDB::bind_method(D_METHOD("global_light_register", "light", "area"), &LRoomManager::global_light_register);
ClassDB::bind_method(D_METHOD("dynamic_light_register", "light", "radius"), &LRoomManager::dynamic_light_register); ClassDB::bind_method(D_METHOD("dynamic_light_register", "light", "radius"), &LRoomManager::dynamic_light_register);
// ClassDB::bind_method(D_METHOD("dynamic_light_register_hint", "light", "radius", "room"), &LRoomManager::dynamic_light_register_hint); // ClassDB::bind_method(D_METHOD("dynamic_light_register_hint", "light", "radius", "room"), &LRoomManager::dynamic_light_register_hint);

16
lroom_manager.h
View File

@ -83,24 +83,17 @@ public:
// These are defined by their ability to move from room to room. // These are defined by their ability to move from room to room.
// You can still move static objects within the same room (e.g. elevators, moving platforms) // You can still move static objects within the same room (e.g. elevators, moving platforms)
// as these don't require checks for changing rooms. // as these don't require checks for changing rooms.
// returns DOB ID
int dob_register(Node * pDOB, const Vector3 &pos, float radius); int dob_register(Node * pDOB, const Vector3 &pos, float radius);
// register but let LPortal know which room the dob should start in
// bool dob_register_hint(Node * pDOB, float radius, Node * pRoom);
bool dob_unregister(int dob_id); bool dob_unregister(int dob_id);
// returns the room ID within // returns the room ID within
int dob_update(int dob_id, const Vector3 &pos); int dob_update(int dob_id, const Vector3 &pos);
// if we are moving the DOB possibly through multiple rooms, then teleport rather than detect
// portal crossings
bool dob_teleport(Node * pDOB);
// bool dob_teleport_hint(Node * pDOB, Node * pRoom);
//______________________________________________________________________________________ //______________________________________________________________________________________
// LIGHTS // LIGHTS
// global directional lights that will apply to all rooms // global directional lights that will apply to all rooms
bool light_register(Node * pLightNode, String szArea); bool global_light_register(Node * pLightNode, String szArea);
// dynamic lights (spot or omni within rooms) // dynamic lights (spot or omni within rooms)
// returns light ID // returns light ID
@ -165,8 +158,7 @@ public:
private: private:
// PER FRAME STUFF // PER FRAME STUFF
// godot ID of the camera (which should be registered as a DOB to allow moving between rooms) // camera
//ObjectID m_ID_camera;
int m_DOB_id_camera; int m_DOB_id_camera;
// keep track of which rooms are visible, so we can hide ones that aren't hit that were previously on // keep track of which rooms are visible, so we can hide ones that aren't hit that were previously on