feat(client): add alt.Object.streamedIn (#313)

altmp · Mar 23, 2024 · 1714dcb · 1714dcb
1 parent 8ab7dea
commit 1714dcb
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/client/src/CV8ScriptRuntime.cpp b/client/src/CV8ScriptRuntime.cpp
@@ -413,6 +413,12 @@ void CV8ScriptRuntime::OnEntityStreamIn(alt::IEntity* entity)
             streamedInPeds.insert({ entity->GetID(), dynamic_cast<alt::IPed*>(entity) });
             break;
         }
+        case alt::IEntity::Type::LOCAL_OBJECT:
+        case alt::IEntity::Type::OBJECT:
+        {
+            streamedInObjects.insert({ entity->GetID(), dynamic_cast<alt::IObject*>(entity) });
+            break;
+        }
     }
 }
 
@@ -437,12 +443,19 @@ void CV8ScriptRuntime::OnEntityStreamOut(alt::IEntity* entity)
             streamedInPeds.erase(entity->GetID());
             break;
         }
+        case alt::IEntity::Type::LOCAL_OBJECT:
+        case alt::IEntity::Type::OBJECT:
+        {
+            streamedInObjects.erase(entity->GetID());
+            break;
+        }
     }
 }
 void CV8ScriptRuntime::OnDisconnect()
 {
     streamedInPlayers.clear();
     streamedInVehicles.clear();
     streamedInPeds.clear();
+    streamedInObjects.clear();
     resourcesLoaded = false;
 }
diff --git a/client/src/CV8ScriptRuntime.h b/client/src/CV8ScriptRuntime.h
@@ -27,9 +27,10 @@ class CV8ScriptRuntime : public alt::IScriptRuntime, public IRuntimeEventHandler
     v8::CpuProfiler* profiler;
     uint32_t profilerSamplingInterval = 100;
 
-    std::unordered_map<uint16_t, alt::IPlayer*> streamedInPlayers;
-    std::unordered_map<uint16_t, alt::IVehicle*> streamedInVehicles;
-    std::unordered_map<uint16_t, alt::IPed*> streamedInPeds;
+    std::unordered_map<uint32_t, alt::IPlayer*> streamedInPlayers;
+    std::unordered_map<uint32_t, alt::IVehicle*> streamedInVehicles;
+    std::unordered_map<uint32_t, alt::IPed*> streamedInPeds;
+    std::unordered_map<uint32_t, alt::IObject*> streamedInObjects;
 
     uint32_t activeWorkers = 0;
 
@@ -218,7 +219,10 @@ class CV8ScriptRuntime : public alt::IScriptRuntime, public IRuntimeEventHandler
     {
         return streamedInPeds;
     }
-
+    auto GetStreamedInObjects()
+    {
+        return streamedInObjects;
+    }
 
     void OnDisconnect();
 };
diff --git a/client/src/bindings/Object.cpp b/client/src/bindings/Object.cpp
@@ -1,5 +1,6 @@
 #include "V8Helpers.h"
 #include "helpers/BindHelpers.h"
+#include "../CV8ScriptRuntime.h"
 
 static void AllGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
@@ -25,6 +26,22 @@ static void CountGetter(v8::Local<v8::String> name, const v8::PropertyCallbackIn
     V8_RETURN_UINT(alt::ICore::Instance().GetBaseObjects(alt::IBaseObject::Type::OBJECT).size());
 }
 
+static void StreamedInGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
+{
+    V8_GET_ISOLATE_CONTEXT_RESOURCE();
+
+    auto streamedIn = CV8ScriptRuntime::Instance().GetStreamedInObjects();
+    auto arr = v8::Array::New(isolate, streamedIn.size());
+    int i = 0;
+    for(auto kv : streamedIn)
+    {
+        arr->Set(ctx, i, resource->GetOrCreateEntity(kv.second, "Object")->GetJSVal(isolate));
+        i++;
+    }
+
+    V8_RETURN(arr);
+}
+
 static void StaticGetByScriptID(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     V8_GET_ISOLATE_CONTEXT_RESOURCE();
@@ -94,6 +111,7 @@ extern V8Class v8Object("Object", v8Entity, [](v8::Local<v8::FunctionTemplate> t
 
     V8Helpers::SetStaticAccessor(isolate, tpl, "all", &AllGetter);
     V8Helpers::SetStaticAccessor(isolate, tpl, "count", &CountGetter);
+    V8Helpers::SetStaticAccessor(isolate, tpl, "streamedIn", &StreamedInGetter);
 
     V8Helpers::SetAccessor<alt::IObject, uint8_t, &alt::IObject::GetAlpha>(isolate, tpl, "alpha");
     V8Helpers::SetAccessor<alt::IObject, uint8_t, &alt::IObject::GetTextureVariation>(isolate, tpl, "textureVariation");