Skip to content

Commit 73af759

Browse files
committed
Clang compile fix
1 parent e08356c commit 73af759

3 files changed

Lines changed: 15 additions & 8 deletions

File tree

‎projects/game/src/Game.cpp‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "Behaviour/Entity/Item/ItemBehaviour.h"
1111

1212
using namespace vg::core;
13+
using namespace vg::engine;
1314

1415
// Static member init
1516
vg::engine::IEngine * Game::s_engine = nullptr;
@@ -96,24 +97,30 @@ void Game::OnPlay()
9697
const IGameObject * root = scene->GetRoot();
9798

9899
// cache characters
99-
auto allCharacters = (vg::core::vector<CharacterBehaviour *>&)root->GetComponentsByType("CharacterBehaviour", false, true); // search children too
100+
auto allCharacters = root->GetComponentsByType("CharacterBehaviour", false, true); // search children too
100101
for (uint j = 0; j < allCharacters.size(); ++j)
101102
{
102-
CharacterBehaviour * character = allCharacters[j];
103+
CharacterBehaviour * character = (CharacterBehaviour * )allCharacters[j];
103104
m_characters[asInteger(character->getCharacterType())].push_back(character);
104105
}
105106

106107
// cache items
107-
auto allItems = (vg::core::vector<ItemBehaviour *>&)root->GetComponentsByType("ItemBehaviour", false, true); // search children too
108+
auto allItems = root->GetComponentsByType("ItemBehaviour", false, true); // search children too
108109
for (uint j = 0; j < allItems.size(); ++j)
109110
{
110-
ItemBehaviour * item = allItems[j];
111+
ItemBehaviour * item = (ItemBehaviour*)allItems[j];
111112
m_items[asInteger(item->getItemType())].push_back(item);
112113
}
113114

114115
// cache vehicle list
115-
m_vehicles = (vg::core::vector<vg::engine::IVehicleComponent *>&)root->GetComponentsByType("VehicleComponent", false, true); // search children too
116-
116+
auto vehicles = root->GetComponentsByType("VehicleComponent", false, true); // search children too
117+
118+
m_vehicles.reserve(vehicles.size());
119+
for (uint j = 0; j < vehicles.size(); ++j)
120+
{
121+
IVehicleComponent * vehicle = (IVehicleComponent*)vehicles[j];
122+
m_vehicles.push_back(vehicle);
123+
}
117124
}
118125

119126
for (uint i = 0; i < enumCount<CharacterType>(); ++i)

‎projects/game/src/Game.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Game : public vg::IGame, public vg::core::Singleton<Game>
3131
~Game ();
3232

3333
bool RegisterClasses () final override;
34-
bool UnregisterClasses ();
34+
bool UnregisterClasses () final override;
3535

3636
bool Init (vg::engine::IEngine & _engine, vg::core::Singletons & _singletons) final override;
3737
bool Deinit () final;

‎src/physics/IPhysicsOptions.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include "core/Options/Options.h"
3-
#include "Physics/Physics_Consts.h"
3+
#include "physics/Physics_Consts.h"
44

55
namespace vg::physics
66
{

0 commit comments

Comments
 (0)