Fix the calls to the getters

Author: sophiedeziel

demo/js/app.js

@@ -71,11 +71,11 @@ export const app = (window.app = createApp({
       const { thumbnails } = parser.metadata;
 
       thumbnail.value = thumbnails['220x124']?.src;
-      layerCount.value = job.layers()?.length;
+      layerCount.value = job.layers?.length;
       const colors = extrusionColor instanceof Array ? extrusionColor : [extrusionColor];
       const currentSettings = {
-        maxLayer: job.layers()?.length,
-        endLayer: job.layers()?.length,
+        maxLayer: job.layers?.length,
+        endLayer: job.layers?.length,
         singleLayerMode,
         renderTravel,
         travelColor: '#' + travelColor.getHexString(),
@@ -94,7 +94,7 @@ export const app = (window.app = createApp({
       };
 
       Object.assign(settings.value, currentSettings);
-      preview.endLayer = job.layers()?.length;
+      preview.endLayer = job.layers?.length;
     };
 
     const loadGCodeFromServer = async (filename) => {
@@ -117,12 +117,12 @@ export const app = (window.app = createApp({
       if (loadProgressive) {
         const { commands } = preview.parser.parseGCode(gcode);
         preview.interpreter.execute(commands, preview.job);
-        if (preview.job.layers() === null) {
+        if (preview.job.layers === null) {
           console.warn('Job is not planar');
           preview.render();
           return;
         }
-        await preview.renderAnimated(Math.ceil(preview.job.layers().length / 60));
+        await preview.renderAnimated(Math.ceil(preview.job.layers.length / 60));
       } else {
         preview.processGCode(gcode);
       }
@@ -212,7 +212,7 @@ export const app = (window.app = createApp({
         preview.lastSegmentColor = settings.value.highlightLastSegment ? settings.value.lastSegmentColor : undefined;
 
         debounce(() => {
-          preview.renderAnimated(Math.ceil(preview.job.layers().length / 60));
+          preview.renderAnimated(Math.ceil(preview.job.layers.length / 60));
         });
       });
     });

src/webgl-preview.ts

@@ -305,7 +305,7 @@ export class WebGLPreview {
 
     this.renderLayerIndex = 0;
 
-    if (this.job.layers() === null) {
+    if (this.job.layers === null) {
       console.warn('Job is not planar');
       this.render();
       return;
@@ -317,7 +317,7 @@ export class WebGLPreview {
   private renderFrameLoop(layerCount: number): Promise<void> {
     return new Promise((resolve) => {
       const loop = () => {
-        if (this.renderLayerIndex >= this.job.layers().length - 1) {
+        if (this.renderLayerIndex >= this.job.layers.length - 1) {
           resolve();
         } else {
           this.renderFrame(layerCount);
@@ -331,11 +331,8 @@ export class WebGLPreview {
   private renderFrame(layerCount: number): void {
     this.group = this.createGroup('layer' + this.renderLayerIndex);
 
-    const endIndex = Math.min(this.renderLayerIndex + layerCount, this.job.layers().length - 1);
-    const pathsToRender = this.job
-      .layers()
-      .slice(this.renderLayerIndex, endIndex)
-      .flatMap((l) => l);
+    const endIndex = Math.min(this.renderLayerIndex + layerCount, this.job.layers.length - 1);
+    const pathsToRender = this.job.layers.slice(this.renderLayerIndex, endIndex).flatMap((l) => l);
 
     this.renderGeometries(pathsToRender.filter((path) => path.travelType === 'Extrusion'));
     this.renderLines(