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 "glm.hpp"
#include <string>
#include <math.h>
float humMean; float humSD; float tempMean; float tempSD; std::string name; std::string fileName; Core::RenderContext modelContext; glm::mat4 modelMatrix;
Plant::Plant::Plant(float humMean, float humSD, float tempMean, float tempSD, std::string name, std::string fileName) {
humMean = humMean;
humSD = humSD;
tempMean = tempMean;
tempSD = tempSD;
name = name;
fileName = fileName;
modelContext = Core::RenderContext{};
modelMatrix = glm::mat4();
namespace Plant
{
class Plant {
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) {
this->humMean = humMean;
this->humSD = humSD;
this->tempMean = tempMean;
this->tempSD = tempSD;
this->name = name;
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);
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
#include <string>
#include "Render_Utils.h"
#include "Render_Utils.cpp"
#include "glm.hpp"
namespace Plant
{
class Plant {
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);
static float calcProbability(float xValue, float mean, float sd);
};
}
//#pragma once
//#include <string>
////#include "Render_Utils.h"
////#include "Render_Utils.cpp"
//#include "glm.hpp"
//
//namespace Plant
//{
// class Plant {
// public:
//
// float humMean; float humSD; float tempMean; float tempSD; std::string name; std::string fileName;
// //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 "Render_Utils.h"
#include "Texture.h"
#include "Distribution.h"
#include "Distribution.cpp"
#include "Box.cpp"
#include <assimp/Importer.hpp>
#include <assimp/scene.h>