From efb626560d3275120af331ba98069c85cc7e18fb Mon Sep 17 00:00:00 2001 From: sotech117 Date: Wed, 13 Dec 2023 00:22:04 -0500 Subject: small fix --- src/utils/scenefilereader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/utils') diff --git a/src/utils/scenefilereader.cpp b/src/utils/scenefilereader.cpp index dc36346..5c69e9f 100644 --- a/src/utils/scenefilereader.cpp +++ b/src/utils/scenefilereader.cpp @@ -292,7 +292,7 @@ bool ScenefileReader::parseLightData(const QJsonObject &lightData, SceneNode *no return false; } QJsonArray directionArray = lightData["direction"].toArray(); - if (directionArray.size() != 3) { + if (directionArray.size() != 3 && directionArray.size() != 4) { std::cout << "directional light direction must be of size 3" << std::endl; return false; } -- cgit v1.2.3-70-g09d2 From c6fde36de2d02e487d86e3d04393a1b9e1661d97 Mon Sep 17 00:00:00 2001 From: Nicholas Bottone Date: Wed, 13 Dec 2023 00:25:19 -0500 Subject: Add velocity field to optionalFields in parsePrimitive function --- src/utils/scenefilereader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/utils') diff --git a/src/utils/scenefilereader.cpp b/src/utils/scenefilereader.cpp index 5c69e9f..928c118 100644 --- a/src/utils/scenefilereader.cpp +++ b/src/utils/scenefilereader.cpp @@ -952,7 +952,7 @@ bool ScenefileReader::parsePrimitive(const QJsonObject &prim, SceneNode *node) { QStringList requiredFields = {"type"}; QStringList optionalFields = { "meshFile", "ambient", "diffuse", "specular", "reflective", "transparent", "shininess", "ior", - "blend", "textureFile", "textureU", "textureV", "bumpMapFile", "bumpMapU", "bumpMapV"}; + "blend", "textureFile", "textureU", "textureV", "bumpMapFile", "bumpMapU", "bumpMapV", "velocity"}; QStringList allFields = requiredFields + optionalFields; for (auto field : prim.keys()) { -- cgit v1.2.3-70-g09d2