sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/house_empty' into develop

Browse Source
This commit is contained in:
Sem van der Hoeven
2021-06-18 17:18:09 +02:00
parent 7c3d68a742 1ff08de055
commit 76206fa13e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/entities/main_character.cpp
View File

@@ -75,8 +75,8 @@ namespace entities
//TODO delete when boundingbox is implemented! //TODO delete when boundingbox is implemented!
if (position.x > 190) position.x = 190; if (position.x > 190) position.x = 190;
else if (position.x < -190) position.x = -190; else if (position.x < -190) position.x = -190;
if (position.y > 350) position.y = 350; if (position.y > 150) position.y = 150;
else if (position.y < -40) position.y = -40; else if (position.y < -60) position.y = -60;
//Move player bounding box according to the position on screen //Move player bounding box according to the position on screen
MoveCollisionBox(); MoveCollisionBox();
if (reg_right->IsHandPresent() && reg_left->IsHandPresent()) if (reg_right->IsHandPresent() && reg_left->IsHandPresent())

18
src/scenes/in_Game_Scene.cpp
View File

@@ -108,6 +108,7 @@ namespace scene
{ {
static unsigned int furniture_count = 0; static unsigned int furniture_count = 0;
std::cout << "loading model chunk" << std::endl; std::cout << "loading model chunk" << std::endl;
if (house_models.size() >= MAX_MODEL_DEQUE_SIZE * furniture_count) if (house_models.size() >= MAX_MODEL_DEQUE_SIZE * furniture_count)
{ {
for (int i = 0; i < furniture_count; i++) for (int i = 0; i < furniture_count; i++)
@@ -117,15 +118,14 @@ namespace scene
} }
} }
int z_offset = model_pos * (house_generator->GetHouseDepth()); // how much "in the distance" we should load the model int z_offset = model_pos * (house_generator->GetHouseDepth()); // how much "in the distance" we should load the model
std::deque<std::shared_ptr<entities::CollisionEntity>> furniture;
house_generator->GenerateHouse(&furniture, glm::vec3(0, -75, -50 - z_offset), 90);
furniture_count = furniture.size();
std::deque<std::shared_ptr<entities::CollisionEntity>> furniture; house_models.insert(house_models.end(), furniture.begin(), furniture.end());
house_generator->GenerateHouse(&furniture, glm::vec3(0, -75, -50 - z_offset), 90); collision_entities.insert(collision_entities.end(), furniture.begin(), furniture.end());
furniture_count = furniture.size(); std::cout << "funriture_count in load chunk (house included): " << furniture_count << std::endl;
furniture_count_old = furniture_count - 1;
house_models.insert(house_models.end(), furniture.begin(), furniture.end());
collision_entities.insert(collision_entities.end(), furniture.begin(), furniture.end());
std::cout << "funriture_count in load chunk (house included): " << furniture_count << std::endl;
furniture_count_old = furniture_count - 1;
} }
@@ -142,7 +142,7 @@ namespace scene
raw_model_char = render_engine::LoadObjModel("res/beeTwo.obj"); raw_model_char = render_engine::LoadObjModel("res/beeTwo.obj");
models::TexturedModel model_char = { raw_model_char, texture }; models::TexturedModel model_char = { raw_model_char, texture };
collision::Box char_box = create_bounding_box(raw_model_char.model_size, glm::vec3(0, 0, 0), 1); collision::Box char_box = create_bounding_box(raw_model_char.model_size, glm::vec3(0, 0, 0), 1);
main_character = std::make_shared<entities::MainCharacter>(model_char, glm::vec3(0, 50, -100), glm::vec3(0, 90, 0), 5, char_box); main_character = std::make_shared<entities::MainCharacter>(model_char, glm::vec3(0, 150, -100), glm::vec3(0, 90, 0), 5, char_box);
//collision_entities.push_back(main_character); //collision_entities.push_back(main_character);
house_generator = new entities::HouseGenerator(); house_generator = new entities::HouseGenerator();