From 08d4e301d25314102f8e60e898a2d014bcf2bd47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Mon, 29 Jan 2024 15:53:47 -0600
Subject: [PATCH] fix: warehouse

---
 .../tankopedia/[id]/components/Lighting.tsx   |  2 +-
 src/core/streams/buffer.ts                    | 31 ++++++++++---------
 src/core/streams/scg.ts                       |  4 +--
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/app/tools/tankopedia/[id]/components/Lighting.tsx b/src/app/tools/tankopedia/[id]/components/Lighting.tsx
index 237d2cc62..6a74bcf93 100644
--- a/src/app/tools/tankopedia/[id]/components/Lighting.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Lighting.tsx
@@ -8,7 +8,7 @@ export function Lighting() {
 
   return (
     <>
-      <Environment preset="dawn" />
+      <Environment preset="warehouse" />
       {/* <directionalLight
         position={[1, 1, -1]}
         intensity={hasPbr ? 3 : 5}
diff --git a/src/core/streams/buffer.ts b/src/core/streams/buffer.ts
index c1daa20ea..266056c7f 100644
--- a/src/core/streams/buffer.ts
+++ b/src/core/streams/buffer.ts
@@ -1,12 +1,12 @@
 export class BufferStream {
   public index = 0;
-  constructor(public stream: Buffer) {}
+  constructor(public buffer: Buffer) {}
 
   skip(size: number) {
     this.index += size;
   }
   read(size: number) {
-    return this.stream.subarray(this.index, this.index + size);
+    return this.buffer.subarray(this.index, this.index + size);
   }
   consume(size: number) {
     const subarray = this.read(size);
@@ -14,12 +14,15 @@ export class BufferStream {
 
     return subarray;
   }
+  increment(size: number) {
+    return (this.index += size) - size;
+  }
 
   readRemaining() {
     return this.read(Number.POSITIVE_INFINITY);
   }
   readRemainingLength() {
-    return this.stream.length - this.index;
+    return this.buffer.length - this.index;
   }
   consumeRemaining() {
     return this.consume(Number.POSITIVE_INFINITY);
@@ -30,38 +33,38 @@ export class BufferStream {
   }
 
   ascii(size: number) {
-    return this.consume(size).toString('ascii');
+    return this.buffer.toString('ascii', this.increment(size), this.index);
   }
 
   int8() {
-    return this.consume(1).readInt8();
+    return this.buffer.readInt8(this.increment(1));
   }
   int16() {
-    return this.consume(2).readInt16LE();
+    return this.buffer.readInt16LE(this.increment(2));
   }
   int32() {
-    return this.consume(4).readInt32LE();
+    return this.buffer.readInt32LE(this.increment(4));
   }
   int64() {
-    return this.consume(8).readBigInt64LE();
+    return this.buffer.readBigInt64LE(this.increment(8));
   }
   uint8() {
-    return this.consume(1).readUInt8();
+    return this.buffer.readUInt8(this.increment(1));
   }
   uint16() {
-    return this.consume(2).readUInt16LE();
+    return this.buffer.readUInt16LE(this.increment(2));
   }
   uint32() {
-    return this.consume(4).readUInt32LE();
+    return this.buffer.readUInt32LE(this.increment(4));
   }
   uint64() {
-    return this.consume(8).readBigUInt64LE();
+    return this.buffer.readBigUInt64LE(this.increment(8));
   }
   float() {
-    return this.consume(4).readFloatLE();
+    return this.buffer.readFloatLE(this.increment(4));
   }
 
   boolean() {
-    return this.consume(1).readUInt8() === 1;
+    return this.buffer.readUInt8(this.increment(1)) === 1;
   }
 }
diff --git a/src/core/streams/scg.ts b/src/core/streams/scg.ts
index ecbe7b1f6..bede51916 100644
--- a/src/core/streams/scg.ts
+++ b/src/core/streams/scg.ts
@@ -89,9 +89,9 @@ export class ScgStream extends ScpgStream {
       );
       const strideBasedSize = stride * polygonGroupRaw.vertexCount;
 
-      if (verticesStream.stream.length !== strideBasedSize) {
+      if (verticesStream.buffer.length !== strideBasedSize) {
         console.warn(
-          `Vertex stride mismatch; expected ${strideBasedSize}, got ${verticesStream.stream.length}; skipping...`,
+          `Vertex stride mismatch; expected ${strideBasedSize}, got ${verticesStream.buffer.length}; skipping...`,
         );
 
         return;