Skip to content

Commit 479ee83

Browse files
author
tigertang
committed
Fix the rendering problem for player_collection
1 parent 8de1e7f commit 479ee83

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

include/happy_bird/player_utility/player_collection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ class PlayerCollection {
2323
return a.object_ptr().lock()->GetOrigin()[2] > b.object_ptr().lock()->GetOrigin()[2];
2424
}
2525
);
26-
void InitPlayerCollection(World *world_ptr);
26+
void InitPlayerCollection(World *world_ptr, std::vector<Object*>& objects);
2727
};

src/player_utility/player_collection.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void PlayerCollection::Traverse(std::function<void(std::weak_ptr<Player>)> yield
4242
}
4343
}
4444

45-
void PlayerCollection::InitPlayerCollection(World *world_ptr) {
45+
void PlayerCollection::InitPlayerCollection(World *world_ptr, std::vector<Object*>& objects) {
4646
btTransform transform;
4747
transform.setIdentity();
4848
transform.setOrigin(World::origin + btVector3(0, World::character_height, -World::character_height));
@@ -68,6 +68,7 @@ void PlayerCollection::InitPlayerCollection(World *world_ptr) {
6868
kMediumParticle | kFlameParticle | kAmbientParticle | kJitterParticle
6969
);
7070
particle_ptr->Attach(object_ptr, btVector3(0, 3, 0));
71+
objects.push_back(particle_ptr);
7172

7273
auto main_player_ptr = shared_ptr<Player>(new Player(object_ptr, character_ptr, controller_ptr));
7374
PushBackFriendly(main_player_ptr);

src/world.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void World::InitPhysics(void) {
113113
void World::InitScene(void) {
114114
stage_.InitStage(kDefaultStage);
115115
player_collection_ptr_ = new PlayerCollection();
116-
player_collection_ptr_->InitPlayerCollection(this);
116+
player_collection_ptr_->InitPlayerCollection(this, objects_);
117117

118118
light_collection->PushBack(
119119
new PointLight(

0 commit comments

Comments
 (0)