Merge branch 'main' of https://github.com/NicholasBottone/the-all-americans-in-cs1230

grinds and merge:

1 files changed, 2 insertions, 2 deletions

diff --git a/src/utils/scenefilereader.cpp b/src/utils/scenefilereader.cpp
index dc36346..928c118 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;
         }
@@ -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()) {