s473559/Grafika2023
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix push_back

Browse Source
This commit is contained in:
s473621 2024-03-04 19:36:46 +01:00
parent 1d263b5887
commit bdcd7163be
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PlanetCreator/cw 6/src/ex_6_1.hpp
View File

@ -255,7 +255,7 @@ PlanetParams populatePlanet(PlanetParams planet, std::vector<Plant::Plant> plant
PlanetParams populatePlanetInstancingDemo(PlanetParams planet, std::vector<Plant::Plant> plants) PlanetParams populatePlanetInstancingDemo(PlanetParams planet, std::vector<Plant::Plant> plants)
{ {
int HOW_MANY_PLANTS = 1000; int HOW_MANY_PLANTS = 100;
int eachSpecie = int(HOW_MANY_PLANTS / plant_specimens.size()); int eachSpecie = int(HOW_MANY_PLANTS / plant_specimens.size());
for (int i = 0; i < plant_specimens.size(); i++) for (int i = 0; i < plant_specimens.size(); i++)
@ -927,11 +927,11 @@ void init(GLFWwindow* window)
for (int i = 1; i <= 35; ++i) { for (int i = 1; i <= 35; ++i) {
std::string plant_name = "testPlant" + std::to_string(i); std::string plant_name = "testPlant" + std::to_string(i);
std::string model_name = "./models/roslina" + std::to_string(i)+".obj"; std::string model_name = "./models/roslina" + std::to_string(i)+".obj";
double random_value = static_cast<double>(rand()) / RAND_MAX; int random_value_1 = rand() % 101;
std::cout << random_value; int random_value_2 = rand() % 11;
//plant_specimens.push_back(Plant::Plant(1, random_value, 1, 1, plant_name, model_name));
}
plant_specimens.push_back(Plant::Plant(random_value_1, random_value_2, random_value_1, random_value_2, plant_name, model_name, plant2_1Material));
}
defaultTexture = Core::LoadTexture("textures/1.png"); defaultTexture = Core::LoadTexture("textures/1.png");
if (defaultTexture == 0) { if (defaultTexture == 0) {
std::cout << "Failed to load default texture" << std::endl; std::cout << "Failed to load default texture" << std::endl;