From 9d468499ad472e7c7dd32c5774fc685938101a4d Mon Sep 17 00:00:00 2001 From: Nicholas Bottone Date: Wed, 13 Dec 2023 00:20:32 -0500 Subject: Add gravity, depthAngle, and over as optional fields in parseCameraData() function --- src/utils/scenefilereader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/utils/scenefilereader.cpp b/src/utils/scenefilereader.cpp index 78e054f..dc36346 100644 --- a/src/utils/scenefilereader.cpp +++ b/src/utils/scenefilereader.cpp @@ -149,7 +149,7 @@ bool ScenefileReader::readJSON() { */ bool ScenefileReader::parseGlobalData(const QJsonObject &globalData) { QStringList requiredFields = {"ambientCoeff", "diffuseCoeff", "specularCoeff"}; - QStringList optionalFields = {"transparentCoeff"}; + QStringList optionalFields = {"transparentCoeff", "gravity"}; QStringList allFields = requiredFields + optionalFields; for (auto field : globalData.keys()) { if (!allFields.contains(field)) { @@ -449,7 +449,7 @@ bool ScenefileReader::parseLightData(const QJsonObject &lightData, SceneNode *no */ bool ScenefileReader::parseCameraData(const QJsonObject &cameraData) { QStringList requiredFields = {"position", "up", "heightAngle"}; - QStringList optionalFields = {"aperture", "focalLength", "look", "focus"}; + QStringList optionalFields = {"aperture", "focalLength", "look", "focus", "depthAngle", "over"}; QStringList allFields = requiredFields + optionalFields; for (auto &field : cameraData.keys()) { if (!allFields.contains(field)) { -- cgit v1.2.3-70-g09d2