Merge branch 'main' into infra

Author: QuimMoya

src/wasm/geometry/IfcGeometryLoader.cpp

@@ -1279,7 +1279,7 @@ namespace webifc::geometry
     // because these calls cannot be reordered we have to use intermediate variables
     double x = _loader.GetDoubleArgument();
     double y = _loader.GetDoubleArgument();
-    double z = _loader.GetDoubleArgument();
+    double z = _loader.GetOptionalDoubleParam(0);
     glm::dvec3 point(x, y, z);
     return point;
   }

src/wasm/parsing/IfcLoader.cpp

@@ -372,7 +372,7 @@ namespace webifc::parsing {
         if (_lines[i]->tapeOffset > pos) break;
         prevLine = i;
       }
-      return prevLine-1;
+      return prevLine+1;
   }
 
    uint32_t IfcLoader::GetRefArgument() const
@@ -491,12 +491,7 @@ namespace webifc::parsing {
          {
            _tokenStream->Read<uint32_t>();
          }
-         else if (t == IfcTokenType::STRING || t == IfcTokenType::INTEGER || t == IfcTokenType::REAL)
-         {
-           uint16_t length = _tokenStream->Read<uint16_t>();
-           _tokenStream->Forward(length);
-         }
-         else if (t == IfcTokenType::LABEL)
+         else if (t == IfcTokenType::STRING || t == IfcTokenType::INTEGER || t == IfcTokenType::REAL || t == IfcTokenType::LABEL || t == IfcTokenType::ENUM)
          {
            uint16_t length = _tokenStream->Read<uint16_t>();
            _tokenStream->Forward(length);
@@ -550,12 +545,7 @@ namespace webifc::parsing {
      			{
      				_tokenStream->Read<uint32_t>();
      			}
-     			else if (t == IfcTokenType::STRING || t == IfcTokenType::INTEGER || t == IfcTokenType::REAL)
-     			{
-     				uint16_t length = _tokenStream->Read<uint16_t>();
-     				_tokenStream->Forward(length);
-     			}
-     			else if (t == IfcTokenType::LABEL)
+     			else if (t == IfcTokenType::STRING || t == IfcTokenType::INTEGER || t == IfcTokenType::REAL || t == IfcTokenType::LABEL || t == IfcTokenType::ENUM)
      			{
      				uint16_t length = _tokenStream->Read<uint16_t>();
      				_tokenStream->Forward(length);
@@ -646,7 +636,7 @@ namespace webifc::parsing {
 
    double IfcLoader::GetOptionalDoubleParam(double defaultValue = 0) const
     {
-      if (GetTokenType() ==IfcTokenType::REAL)
+      if (GetTokenType() == IfcTokenType::REAL)
       {
         StepBack();
         return GetDoubleArgument();