ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding lua scene description

Browse source
This commit is contained in:
IlyaShurupov 2023-10-16 22:09:20 +03:00 • committed by Ilya Shurupov
parent d6c326b83d
commit bb2b0b926f
9 changed files with 195 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

54
RayTracer/applications/Rayt.cpp
View file

@ -1,47 +1,16 @@
// #include "NewPlacement.hpp"
#include "Buffer.hpp"
#include "CommandLine.hpp"
#include "RayTracer.hpp"
#include "Strings.hpp"
#include "Timing.hpp"
#include "Vec.hpp"
#include "Rayt.hpp"
#include "OBJ_Loader.h"
#include "CommandLine.hpp"
#include "Timing.hpp"
#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb_image_write.h"
using namespace tp;
void loadScene(Scene& scene, const String& scenePath) {
objl::Loader Loader;
if (!Loader.LoadFile(scenePath.read())) {
std::cout << "Failed to Load File. May have failed to find it or it was not an .obj file.\n";
return;
}
for (auto& curMesh : Loader.LoadedMeshes) {
scene.mObjects.append(Topology());
auto object = &scene.mObjects.last();
for (int j = 0; j < curMesh.Indices.size(); j += 3) {
unsigned int idx1 = curMesh.Indices[j];
unsigned int idx2 = curMesh.Indices[j + 1];
unsigned int idx3 = curMesh.Indices[j + 2];
Vec3F v1 = {curMesh.Vertices[idx1].Position.X, curMesh.Vertices[idx1].Position.Y, curMesh.Vertices[idx1].Position.Z};
Vec3F v2 = {curMesh.Vertices[idx2].Position.X, curMesh.Vertices[idx2].Position.Y, curMesh.Vertices[idx2].Position.Z};
Vec3F v3 = {curMesh.Vertices[idx3].Position.X, curMesh.Vertices[idx3].Position.Y, curMesh.Vertices[idx3].Position.Z};
object->addTrig(v1, v2, v3);
}
object->updateTransformed();
}
}
void writeImage(const RayTracer::RenderBuffer& output) {
// Save the data to a PNG file
struct urgb {
@ -62,24 +31,21 @@ void writeImage(const RayTracer::RenderBuffer& output) {
if (stbi_write_png("output.png", converted.size().x, converted.size().y, 4, converted.getBuff(), converted.size().x * 4) != 0) {
// Image saved successfully
std::cout << "Image saved successfully." << std::endl;
printf("Image saved successfully.\n");
} else {
std::cerr << "Error saving the image." << std::endl;
printf("Error saving the image.\n");
}
}
void renderCommand(const String& scenePath, RayTracer::RenderBuffer::Index2D size) {
void renderCommand(const String& scenePath) {
Scene scene;
loadScene(scene, scenePath);
RayTracer::RenderSettings settings;
scene.mCamera.lookAtPoint({0, 0, 0}, {-3, -3, 3}, {1, 1, 1});
scene.mCamera.setFOV(3.14 / 4);
scene.mCamera.setFar(100);
scene.mCamera.setRatio((halnf) size.y / (halnf) size.x);
loadScene(scene, scenePath, settings);
RayTracer::RenderBuffer output;
output.reserve(size);
output.reserve(RayTracer::RenderBuffer::Index2D(settings.size.x, settings.size.y));
RayTracer rayt;
@ -99,7 +65,7 @@ int main(int argc, const char** argv) {
tp::ModuleManifest module("Rayt", nullptr, nullptr, deps);
if (module.initialize()) {
renderCommand("scene.obj", {600, 600});
renderCommand("scene.lua");
module.deinitialize();
}