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

compiles, header file empty

Browse Source
This commit is contained in:
Dominik Piasecki 2024-01-22 13:10:12 +01:00
parent 7431154600
commit d06bc6b54a
3 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
PlanetCreator/cw 6/src/Distribution.cpp
View File

@ -1,23 +1,34 @@
#include "Distribution.h" #include "Distribution.h"
#include "glm.hpp"
#include <string>
#include <math.h> #include <math.h>
namespace Plant
{
float humMean; float humSD; float tempMean; float tempSD; std::string name; std::string fileName; Core::RenderContext modelContext; glm::mat4 modelMatrix; class Plant {
Plant::Plant::Plant(float humMean, float humSD, float tempMean, float tempSD, std::string name, std::string fileName) { public:
humMean = humMean; float humMean; float humSD; float tempMean; float tempSD; std::string name; std::string fileName; glm::mat4 modelMatrix;
humSD = humSD; Plant(float humMean, float humSD, float tempMean, float tempSD, std::string name, std::string fileName) {
tempMean = tempMean; this->humMean = humMean;
tempSD = tempSD; this->humSD = humSD;
name = name; this->tempMean = tempMean;
fileName = fileName; this->tempSD = tempSD;
modelContext = Core::RenderContext{}; this->name = name;
modelMatrix = glm::mat4(); this->fileName = fileName;
//this->modelContext = Core::RenderContext{};
this->modelMatrix = glm::mat4();
} }
float Plant::Plant::calcProbability(float xValue, float mean, float sd)
float calcProbability(float xValue, float mean, float sd)
{ {
float temp = (xValue - mean) / sd * sqrt(2); float temp = (xValue - mean) / sd * sqrt(2);
return (1+erf(temp))/2; return (1 + erf(temp)) / 2;
} }
}
;
}

36
PlanetCreator/cw 6/src/Distribution.h
View File

@ -1,16 +1,20 @@
#pragma once //#pragma once
#include <string> //#include <string>
#include "Render_Utils.h" ////#include "Render_Utils.h"
#include "Render_Utils.cpp" ////#include "Render_Utils.cpp"
#include "glm.hpp" //#include "glm.hpp"
//
namespace Plant //namespace Plant
{ //{
class Plant { // class Plant {
public: // public:
float humMean; float humSD; float tempMean; float tempSD; std::string name; std::string fileName; glm::mat4 modelMatrix; //
Plant(float humMean, float humSD, float tempMean, float tempSD, std::string name, std::string fileName); // float humMean; float humSD; float tempMean; float tempSD; std::string name; std::string fileName;
static float calcProbability(float xValue, float mean, float sd); // //Core::RenderContext modelContext;
//
}; // glm::mat4 modelMatrix;
} // Plant(float humMean, float humSD, float tempMean, float tempSD, std::string name, std::string fileName);
// static float calcProbability(float xValue, float mean, float sd);
//
// };
//}

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

@ -10,7 +10,8 @@
#include "Shader_Loader.h" #include "Shader_Loader.h"
#include "Render_Utils.h" #include "Render_Utils.h"
#include "Texture.h" #include "Texture.h"
#include "Distribution.h"
#include "Distribution.cpp"
#include "Box.cpp" #include "Box.cpp"
#include <assimp/Importer.hpp> #include <assimp/Importer.hpp>
#include <assimp/scene.h> #include <assimp/scene.h>