Refactor ExampleApps
This commit is contained in:
@@ -21,85 +21,95 @@
|
||||
#pragma ide diagnostic ignored "cert-msc50-cpp"
|
||||
#pragma ide diagnostic ignored "cppcoreguidelines-narrowing-conversions"
|
||||
|
||||
using namespace OpenVulkano::Scene;
|
||||
using namespace OpenVulkano::Input;
|
||||
using namespace OpenVulkano::Math;
|
||||
|
||||
uint32_t GEOS = 3000, OBJECTS = 10000, DYNAMIC = 1000;
|
||||
|
||||
class CubesExampleAppImpl final : public CubesExampleApp
|
||||
namespace OpenVulkano
|
||||
{
|
||||
Scene scene;
|
||||
PerspectiveCamera cam;
|
||||
OpenVulkano::FreeCamCameraController camController;
|
||||
Material mat;
|
||||
Shader shader;
|
||||
std::vector<SimpleDrawable> drawablesPool;
|
||||
std::vector<Node> nodesPool;
|
||||
Vector3f_SIMD position = {0,0,-10};
|
||||
using namespace Scene;
|
||||
using namespace Input;
|
||||
using namespace Math;
|
||||
|
||||
public:
|
||||
std::string GetAppName() override { return "ExampleApp"; }
|
||||
OpenVulkano::Version GetAppVersion() override { return {"v1.0"}; }
|
||||
|
||||
void Init() override
|
||||
class CubesExampleAppImpl final : public CubesExampleApp
|
||||
{
|
||||
auto engineConfig = OpenVulkano::EngineConfiguration::GetEngineConfiguration();
|
||||
engineConfig->SetNumThreads(4);
|
||||
engineConfig->SetPreferFramebufferFormatSRGB(false);
|
||||
OpenVulkano::Scene::Scene scene;
|
||||
PerspectiveCamera cam;
|
||||
OpenVulkano::FreeCamCameraController camController;
|
||||
Material mat;
|
||||
Shader shader;
|
||||
std::vector<SimpleDrawable> drawablesPool;
|
||||
std::vector<Node> nodesPool;
|
||||
Vector3f_SIMD position = {0, 0, -10};
|
||||
|
||||
std::srand(1); // Fix seed for random numbers
|
||||
scene.Init();
|
||||
cam.Init(70, 16, 9, 0.1f, 100);
|
||||
scene.SetCamera(&cam);
|
||||
cam.SetMatrix(Utils::translate(Matrix4f(1), Vector3f_SIMD(0,0,-10)));
|
||||
shader.AddShaderProgram(OpenVulkano::ShaderProgramType::VERTEX, "Shader/basic");
|
||||
shader.AddShaderProgram(OpenVulkano::ShaderProgramType::FRAGMENT, "Shader/basic");
|
||||
shader.AddVertexInputDescription(OpenVulkano::Vertex::GetVertexInputDescription());
|
||||
drawablesPool.resize(GEOS);
|
||||
for(uint32_t i = 0; i < GEOS; i++)
|
||||
public:
|
||||
std::string GetAppName() override
|
||||
{ return "ExampleApp"; }
|
||||
|
||||
OpenVulkano::Version GetAppVersion() override
|
||||
{ return {"v1.0"}; }
|
||||
|
||||
void Init() override
|
||||
{
|
||||
Geometry* geo = new Geometry();
|
||||
geo->InitCube(std::rand() % 1000 / 1000.0f + 0.01f, std::rand() % 1000 / 1000.0f + 0.01f, std::rand() % 1000 / 1000.0f + 0.01f, Vector4f((std::rand() % 255) / 255.0f, (std::rand() % 255) / 255.0f, (std::rand() % 255) / 255.0f, 1));
|
||||
drawablesPool[i].Init(&shader, geo, &mat);
|
||||
}
|
||||
nodesPool.resize(OBJECTS);
|
||||
for(uint32_t i = 0; i < OBJECTS; i++)
|
||||
{
|
||||
nodesPool[i].Init();
|
||||
scene.GetRoot()->AddChild(&nodesPool[i]);
|
||||
if (i < DYNAMIC) nodesPool[i].SetUpdateFrequency(UpdateFrequency::Always);
|
||||
nodesPool[i].AddDrawable(&drawablesPool[std::rand() % GEOS]);
|
||||
nodesPool[i].SetMatrix(Utils::translate(glm::mat4x4(1), Vector3f((std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5)));
|
||||
auto engineConfig = OpenVulkano::EngineConfiguration::GetEngineConfiguration();
|
||||
engineConfig->SetNumThreads(4);
|
||||
engineConfig->SetPreferFramebufferFormatSRGB(false);
|
||||
|
||||
std::srand(1); // Fix seed for random numbers
|
||||
scene.Init();
|
||||
cam.Init(70, 16, 9, 0.1f, 100);
|
||||
scene.SetCamera(&cam);
|
||||
cam.SetMatrix(Math::Utils::translate(Matrix4f(1), Vector3f_SIMD(0, 0, -10)));
|
||||
shader.AddShaderProgram(OpenVulkano::ShaderProgramType::VERTEX, "Shader/basic");
|
||||
shader.AddShaderProgram(OpenVulkano::ShaderProgramType::FRAGMENT, "Shader/basic");
|
||||
shader.AddVertexInputDescription(OpenVulkano::Vertex::GetVertexInputDescription());
|
||||
drawablesPool.resize(GEOS);
|
||||
for (uint32_t i = 0; i < GEOS; i++)
|
||||
{
|
||||
Geometry* geo = new Geometry();
|
||||
geo->InitCube(std::rand() % 1000 / 1000.0f + 0.01f, std::rand() % 1000 / 1000.0f + 0.01f, std::rand() % 1000 / 1000.0f + 0.01f,
|
||||
Vector4f((std::rand() % 255) / 255.0f, (std::rand() % 255) / 255.0f, (std::rand() % 255) / 255.0f, 1));
|
||||
drawablesPool[i].Init(&shader, geo, &mat);
|
||||
}
|
||||
nodesPool.resize(OBJECTS);
|
||||
for (uint32_t i = 0; i < OBJECTS; i++)
|
||||
{
|
||||
nodesPool[i].Init();
|
||||
scene.GetRoot()->AddChild(&nodesPool[i]);
|
||||
if (i < DYNAMIC) nodesPool[i].SetUpdateFrequency(UpdateFrequency::Always);
|
||||
nodesPool[i].AddDrawable(&drawablesPool[std::rand() % GEOS]);
|
||||
nodesPool[i].SetMatrix(Math::Utils::translate(glm::mat4x4(1), Vector3f((std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5)));
|
||||
}
|
||||
|
||||
GetGraphicsAppManager()->GetRenderer()->SetScene(&scene);
|
||||
|
||||
camController.Init(&cam);
|
||||
camController.SetDefaultKeybindings();
|
||||
}
|
||||
|
||||
GetGraphicsAppManager()->GetRenderer()->SetScene(&scene);
|
||||
void Tick() override
|
||||
{
|
||||
for (uint32_t i = 0; i < DYNAMIC; i++)
|
||||
{
|
||||
nodesPool[i].SetMatrix(glm::translate(glm::mat4x4(1), glm::vec3((std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5)));
|
||||
}
|
||||
|
||||
camController.Init(&cam);
|
||||
camController.SetDefaultKeybindings();
|
||||
camController.Tick();
|
||||
}
|
||||
|
||||
void Close() override
|
||||
{}
|
||||
};
|
||||
|
||||
IGraphicsApp* CubesExampleApp::Create()
|
||||
{
|
||||
return new CubesExampleAppImpl();
|
||||
}
|
||||
|
||||
void Tick() override
|
||||
std::unique_ptr<IGraphicsApp> CubesExampleApp::CreateUnique()
|
||||
{
|
||||
for(uint32_t i = 0; i < DYNAMIC; i++)
|
||||
{
|
||||
nodesPool[i].SetMatrix(glm::translate(glm::mat4x4(1), glm::vec3((std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5, (std::rand() % 10000) / 1000.0f - 5)));
|
||||
}
|
||||
|
||||
camController.Tick();
|
||||
return std::make_unique<CubesExampleAppImpl>();
|
||||
}
|
||||
|
||||
void Close() override{}
|
||||
};
|
||||
|
||||
OpenVulkano::IGraphicsApp* CubesExampleApp::Create()
|
||||
{
|
||||
return new CubesExampleAppImpl();
|
||||
}
|
||||
|
||||
std::unique_ptr<OpenVulkano::IGraphicsApp> CubesExampleApp::CreateUnique()
|
||||
{
|
||||
return std::make_unique<CubesExampleAppImpl>();
|
||||
}
|
||||
|
||||
#pragma clang diagnostic pop
|
||||
|
||||
Reference in New Issue
Block a user