aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp172
1 files changed, 99 insertions, 73 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 8cb00b8..29828d8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,85 +2,111 @@
#include <QCommandLineParser>
#include <QImage>
#include <QtCore>
+#include <QApplication>
+#include <QScreen>
+#include <iostream>
+#include <QSettings>
+#include <QSurfaceFormat>
#include <iostream>
#include "utils/sceneparser.h"
#include "raytracer/raytracer.h"
#include "raytracer/raytracescene.h"
+#include "mainwindow.h"
+
int main(int argc, char *argv[])
{
- QCoreApplication a(argc, argv);
-
- QCommandLineParser parser;
- parser.addHelpOption();
- parser.addPositionalArgument("config", "Path of the config file.");
- parser.process(a);
-
- auto positionalArgs = parser.positionalArguments();
- if (positionalArgs.size() != 1) {
- std::cerr << "Not enough arguments. Please provide a path to a config file (.ini) as a command-line argument." << std::endl;
- a.exit(1);
- return 1;
- }
-
- QSettings settings( positionalArgs[0], QSettings::IniFormat );
- QString iScenePath = settings.value("IO/scene").toString();
- QString oImagePath = settings.value("IO/output").toString();
-
- RenderData metaData;
- bool success = SceneParser::parse(iScenePath.toStdString(), metaData);
-
- if (!success) {
- std::cerr << "Error loading scene: \"" << iScenePath.toStdString() << "\"" << std::endl;
- a.exit(1);
- return 1;
- }
-
- // Raytracing-relevant code starts here
-
- int width = settings.value("Canvas/width").toInt();
- int height = settings.value("Canvas/height").toInt();
-
- // Extracting data pointer from Qt's image API
- QImage image = QImage(width, height, QImage::Format_RGBX8888);
- image.fill(Qt::black);
- RGBA *data = reinterpret_cast<RGBA *>(image.bits());
-
- // Setting up the raytracer
- Config rtConfig{};
- rtConfig.enableShadow = settings.value("Feature/shadows").toBool();
- rtConfig.enableReflection = settings.value("Feature/reflect").toBool();
- rtConfig.enableRefraction = settings.value("Feature/refract").toBool();
- rtConfig.enableTextureMap = settings.value("Feature/texture").toBool();
- rtConfig.enableTextureFilter = settings.value("Feature/texture-filter").toBool();
- rtConfig.enableParallelism = settings.value("Feature/parallel").toBool();
- rtConfig.enableSuperSample = settings.value("Feature/super-sample").toBool();
- rtConfig.enableAntiAliasing = settings.value("Feature/post-process").toBool();
- rtConfig.enableAcceleration = settings.value("Feature/acceleration").toBool();
- rtConfig.enableDepthOfField = settings.value("Feature/depthoffield").toBool();
- rtConfig.maxRecursiveDepth = settings.value("Settings/maximum-recursive-depth").toInt();
- rtConfig.onlyRenderNormals = settings.value("Settings/only-render-normals").toBool();
-
- RayTracer raytracer{ rtConfig };
-
- RayTraceScene rtScene{ width, height, metaData };
-
- // Note that we're passing `data` as a pointer (to its first element)
- // Recall from Lab 1 that you can access its elements like this: `data[i]`
- raytracer.render(data, rtScene);
-
- // Saving the image
- success = image.save(oImagePath);
- if (!success) {
- success = image.save(oImagePath, "PNG");
- }
- if (success) {
- std::cout << "Saved rendered image to \"" << oImagePath.toStdString() << "\"" << std::endl;
- } else {
- std::cerr << "Error: failed to save image to \"" << oImagePath.toStdString() << "\"" << std::endl;
- }
-
- a.exit();
- return 0;
+ // QCoreApplication a(argc, argv);
+
+ // QCommandLineParser parser;
+ // parser.addHelpOption();
+ // parser.addPositionalArgument("config", "Path of the config file.");
+ // parser.process(a);
+
+ // auto positionalArgs = parser.positionalArguments();
+ // if (positionalArgs.size() != 1) {
+ // std::cerr << "Not enough arguments. Please provide a path to a config file (.ini) as a command-line argument." << std::endl;
+ // a.exit(1);
+ // return 1;
+ // }
+
+ // QSettings settings( positionalArgs[0], QSettings::IniFormat );
+ // QString iScenePath = settings.value("IO/scene").toString();
+ // QString oImagePath = settings.value("IO/output").toString();
+
+ // RenderData metaData;
+ // bool success = SceneParser::parse(iScenePath.toStdString(), metaData);
+
+ // if (!success) {
+ // std::cerr << "Error loading scene: \"" << iScenePath.toStdString() << "\"" << std::endl;
+ // a.exit(1);
+ // return 1;
+ // }
+
+ // // Raytracing-relevant code starts here
+
+ // int width = settings.value("Canvas/width").toInt();
+ // int height = settings.value("Canvas/height").toInt();
+
+ // // Extracting data pointer from Qt's image API
+ // QImage image = QImage(width, height, QImage::Format_RGBX8888);
+ // image.fill(Qt::black);
+ // RGBA *data = reinterpret_cast<RGBA *>(image.bits());
+
+ // // Setting up the raytracer
+ // Config rtConfig{};
+ // rtConfig.enableShadow = settings.value("Feature/shadows").toBool();
+ // rtConfig.enableReflection = settings.value("Feature/reflect").toBool();
+ // rtConfig.enableRefraction = settings.value("Feature/refract").toBool();
+ // rtConfig.enableTextureMap = settings.value("Feature/texture").toBool();
+ // rtConfig.enableTextureFilter = settings.value("Feature/texture-filter").toBool();
+ // rtConfig.enableParallelism = settings.value("Feature/parallel").toBool();
+ // rtConfig.enableSuperSample = settings.value("Feature/super-sample").toBool();
+ // rtConfig.enableAntiAliasing = settings.value("Feature/post-process").toBool();
+ // rtConfig.enableAcceleration = settings.value("Feature/acceleration").toBool();
+ // rtConfig.enableDepthOfField = settings.value("Feature/depthoffield").toBool();
+ // rtConfig.maxRecursiveDepth = settings.value("Settings/maximum-recursive-depth").toInt();
+ // rtConfig.onlyRenderNormals = settings.value("Settings/only-render-normals").toBool();
+
+ // RayTracer raytracer{ rtConfig };
+
+ // RayTraceScene rtScene{ width, height, metaData };
+
+ // // Note that we're passing `data` as a pointer (to its first element)
+ // // Recall from Lab 1 that you can access its elements like this: `data[i]`
+ // raytracer.render(data, rtScene);
+
+ // // Saving the image
+ // success = image.save(oImagePath);
+ // if (!success) {
+ // success = image.save(oImagePath, "PNG");
+ // }
+ // if (success) {
+ // std::cout << "Saved rendered image to \"" << oImagePath.toStdString() << "\"" << std::endl;
+ // } else {
+ // std::cerr << "Error: failed to save image to \"" << oImagePath.toStdString() << "\"" << std::endl;
+ // }
+
+ // a.exit();
+ // return 0;
+
+ QApplication a(argc, argv);
+
+ QCoreApplication::setApplicationName("The All Americans 4D Raytracer");
+ QCoreApplication::setOrganizationName("CS 1230/2230");
+ // QCoreApplication::setApplicationVersion(QT_VERSION_STR);
+
+ QSurfaceFormat fmt;
+ fmt.setVersion(4, 1);
+ fmt.setProfile(QSurfaceFormat::CoreProfile);
+ QSurfaceFormat::setDefaultFormat(fmt);
+
+ MainWindow w;
+ w.initialize();
+ w.resize(800, 600);
+ w.show();
+ int return_val = a.exec();
+ w.finish();
+ return return_val;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-06 18:44:51 +0000