Hiding first person models properly

src/Engine/Core/EntityWrapper.cpp

@@ -3,6 +3,11 @@
 
 const EntityWrapper EntityWrapper::Invalid = EntityWrapper(nullptr, EntityID_Invalid);
 
+const std::string EntityWrapper::Name()
+{
+    return World->GetName(ID);
+}
+
 bool EntityWrapper::HasComponent(const std::string& componentName)
 {
     if (!Valid()) {

src/Engine/Rendering/RenderSystem.cpp

@@ -52,11 +52,15 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& jobs)
 
         // Don't render the local player
         if (entity == m_LocalPlayer || entity.IsChildOf(m_LocalPlayer)) {
-            if (!entity.HasComponent("HealthHUD")) { //Should work but needs to be fixed. Should only render the things "childed" to the local player camera
-                //continue;
+            if (!entity.HasComponent("HealthHUD") && entity.Name() != "Crosshair" && entity.Name() != "Weapon") { //Should work but needs to be fixed. Should only render the things "childed" to the local player camera
+                continue;
             }
         }
 
+        if ((entity.Name() == "Weapon" || entity.HasComponent("HealthHUD")) && !entity.IsChildOf(m_LocalPlayer)) {
+            continue;
+        }
+
         Model* model;
         try {
             model = ResourceManager::Load<::Model, true>(resource);