Merge remote-tracking branch 'origin/master' into Menu

This commit is contained in:
Tleety
2016-03-11 15:07:52 +01:00
26 changed files with 4620 additions and 3826 deletions
+7 -2
View File
@@ -234,9 +234,14 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
void CapturePointSystem::ChangeCapturePointModelsVisibility(EntityWrapper &capturePointModels, bool isOwner) {
(bool&)capturePointModels["Model"]["Visible"] = isOwner;
for (auto& capModel : capturePointModels.ChildrenWithComponent("Model"))
for (auto& capModel : capturePointModels.ChildrenWithComponent("Transform"))
{
(bool&)capModel["Model"]["Visible"] = isOwner;
if (capModel.HasComponent("Model")) {
(bool&)capModel["Model"]["Visible"] = isOwner;
}
if (capModel.HasComponent("PointLight")) {
(bool&)capModel["PointLight"]["Visible"] = isOwner;
}
}
}