x_ite-off-parser 1.0.3 → 1.0.5

package/README.md

@@ -13,10 +13,10 @@ Include the script after X_ITE:
 
 ```html
 <script defer src="https://cdn.jsdelivr.net/npm/x_ite@15.0.3/dist/x_ite.min.js"></script>
-<script defer src="https://cdn.jsdelivr.net/npm/x_ite-off-parser@1.0.3/dist/x_ite-off-parser.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/x_ite-off-parser@1.0.5/dist/x_ite-off-parser.min.js"></script>
 <!-- or as ES module -->
 <script type="module" src="https://cdn.jsdelivr.net/npm/x_ite@15.0.3/dist/x_ite.min.mjs"></script>
-<script type="module" src="https://cdn.jsdelivr.net/npm/x_ite-off-parser@1.0.3/dist/x_ite-off-parser.min.js"></script>
+<script type="module" src="https://cdn.jsdelivr.net/npm/x_ite-off-parser@1.0.5/dist/x_ite-off-parser.min.js"></script>
 ```
 
 Now you can load OFF files:

package/dist/x_ite-off-parser.js

@@ -9,6 +9,7 @@ const Grammar = X3D .Expressions ({
    // General
    whitespaces: /[\x20\n\t\r,]+/y,
    whitespacesNoLineTerminator: /[\x20\t]+/y,
+   untilEndOfLine: /[^\r\n]+/y,
    comment: /#[^\r\n]*(?=[\r\n]|$)/y,
    header: /OFF/y,
 
@@ -27,6 +28,7 @@ class OffParser extends X3D .X3DParser
    {
       super (scene);
 
+      this .lineNumber = 1;
       this .coordIndex = [ ];
       this .colors     = [ ];
       this .points     = [ ];
@@ -44,7 +46,7 @@ class OffParser extends X3D .X3DParser
 
    isValid ()
    {
-      return this .input .match (/OFF\r?\n/);
+      return this .input .match (/^OFF/);
    }
 
    parseIntoScene (resolve, reject)
@@ -61,7 +63,7 @@ class OffParser extends X3D .X3DParser
          scene   = this .getScene ();
 
       if (!this .statements ())
-         throw new Error ("Invalid file structure.");
+         throw new Error (`Couldn't parse OFF file: Invalid file structure at line ${this .lineNumber}.`);
 
       scene .setEncoding ("OFF");
       scene .setProfile (browser .getProfile ("Interchange"));
@@ -77,7 +79,7 @@ class OffParser extends X3D .X3DParser
          geometry       = scene .createNode ("IndexedFaceSet"),
          coordinate     = scene .createNode ("Coordinate");
 
-      if (this .colors .length)
+      if (this .colors .length / 3 === this .numFaces)
       {
          const color = scene .createNode ("Color");
 
@@ -116,32 +118,6 @@ class OffParser extends X3D .X3DParser
       return false;
    }
 
-   comments ()
-   {
-      while (this .comment ())
-         ;
-   }
-
-   comment ()
-   {
-      this .whitespaces ();
-
-      if (Grammar .comment .parse (this))
-         return true;
-
-      return false;
-   }
-
-   whitespaces ()
-   {
-      Grammar .whitespaces .parse (this);
-   }
-
-   whitespacesNoLineTerminator ()
-   {
-      Grammar .whitespacesNoLineTerminator .parse (this);
-   }
-
    header ()
    {
       return Grammar .header .parse (this);
@@ -192,6 +168,8 @@ class OffParser extends X3D .X3DParser
                if (this .double ())
                {
                   points .push (this .value);
+
+                  this .untilEndOfLine ();
                   continue;
                }
             }
@@ -233,17 +211,18 @@ class OffParser extends X3D .X3DParser
 
             if (this .int32 ())
             {
-               const r = this .value / 255;
+               colors .push (this .value / 255);
 
                if (this .int32 ())
                {
-                  const g = this .value / 255;
+                  colors .push (this .value / 255);
 
                   if (this .int32 ())
-                     colors .push (r, g, this .value / 255);
+                     colors .push (this .value / 255);
                }
             }
 
+            this .untilEndOfLine ();
             continue;
          }
 
@@ -253,6 +232,46 @@ class OffParser extends X3D .X3DParser
       return true;
    }
 
+   comments ()
+   {
+      while (this .comment ())
+         ;
+   }
+
+   comment ()
+   {
+      this .whitespaces ();
+
+      if (Grammar .comment .parse (this))
+         return true;
+
+      return false;
+   }
+
+   whitespaces ()
+   {
+      if (Grammar .whitespaces .parse (this))
+         this .lines (this .result [0]);
+   }
+
+   whitespacesNoLineTerminator ()
+   {
+      Grammar .whitespacesNoLineTerminator .parse (this);
+   }
+
+   untilEndOfLine ()
+   {
+      Grammar .untilEndOfLine .parse (this);
+   }
+
+   lines (string)
+   {
+      const match = string .match (Grammar .LineFeed);
+
+      if (match)
+         this .lineNumber += match .length;
+   }
+
    int32 ()
    {
       this .whitespacesNoLineTerminator ();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x_ite-off-parser",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "OFF 3D File Format Parser for X_ITE",
   "main": "dist/x_ite-off-parser.js",
   "module": "dist/x_ite-off-parser.js",