From b5442132cea962d5c845794df5656dd67bbeea5b Mon Sep 17 00:00:00 2001
From: cmhhelgeson <62450112+cmhhelgeson@users.noreply.github.com>
Date: Thu, 26 Oct 2023 10:51:58 -0700
Subject: [PATCH] Added suggestions

---
 src/sample/normalMap/main.ts  | 39 ++++++++++++++++-------------------
 src/sample/normalMap/utils.ts | 21 +++++++++++--------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/sample/normalMap/main.ts b/src/sample/normalMap/main.ts
index 07833ba4..5bc0a352 100644
--- a/src/sample/normalMap/main.ts
+++ b/src/sample/normalMap/main.ts
@@ -273,31 +273,29 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
     .onChange(onChangeTexture);
   const lightFolder = gui.addFolder('Light');
   const depthFolder = gui.addFolder('Depth');
-  lightFolder.add(settings, 'Reset Light').onChange(() => {
-    lightPosXCell.setValue(1.7);
-    lightPosYCell.setValue(-0.7);
-    lightPosZCell.setValue(1.9);
-    lightIntensityCell.setValue(0.02);
-  });
-  const lightPosXCell = lightFolder.add(settings, 'lightPosX', -5, 5).step(0.1);
-  const lightPosYCell = lightFolder.add(settings, 'lightPosY', -5, 5).step(0.1);
-  const lightPosZCell = lightFolder.add(settings, 'lightPosZ', -5, 5).step(0.1);
-  const lightIntensityCell = lightFolder
+  const resetLightController = lightFolder
+    .add(settings, 'Reset Light')
+    .onChange(() => {
+      lightPosXController.setValue(1.7);
+      lightPosYController.setValue(-0.7);
+      lightPosZController.setValue(1.9);
+      lightIntensityController.setValue(0.02);
+    });
+  const lightPosXController = lightFolder
+    .add(settings, 'lightPosX', -5, 5)
+    .step(0.1);
+  const lightPosYController = lightFolder
+    .add(settings, 'lightPosY', -5, 5)
+    .step(0.1);
+  const lightPosZController = lightFolder
+    .add(settings, 'lightPosZ', -5, 5)
+    .step(0.1);
+  const lightIntensityController = lightFolder
     .add(settings, 'lightIntensity', 0.0, 0.1)
     .step(0.002);
   depthFolder.add(settings, 'depthScale', 0.0, 0.1).step(0.01);
   depthFolder.add(settings, 'depthLayers', 1, 32).step(1);
 
-  const liFunctionElements = document.getElementsByClassName('cr function');
-  for (let i = 0; i < liFunctionElements.length; i++) {
-    (liFunctionElements[i].children[0] as HTMLElement).style.display = 'flex';
-    (liFunctionElements[i].children[0] as HTMLElement).style.justifyContent =
-      'center';
-    (
-      liFunctionElements[i].children[0].children[1] as HTMLElement
-    ).style.position = 'absolute';
-  }
-
   function frame() {
     if (!pageState.active) return;
 
@@ -313,7 +311,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => {
     ]);
 
     const mappingType = getMappingType();
-    console.log(mappingType);
 
     device.queue.writeBuffer(
       uniformBuffer,
diff --git a/src/sample/normalMap/utils.ts b/src/sample/normalMap/utils.ts
index 107cc0f6..cf80e50d 100644
--- a/src/sample/normalMap/utils.ts
+++ b/src/sample/normalMap/utils.ts
@@ -32,28 +32,31 @@ export const createBindGroupDescriptor = (
   label: string,
   device: GPUDevice
 ): BindGroupsObjectsAndLayout => {
+  // Create layout of each entry within a bindGroup
   const layoutEntries: GPUBindGroupLayoutEntry[] = [];
   for (let i = 0; i < bindings.length; i++) {
-    const layoutEntry: any = {};
-    layoutEntry.binding = bindings[i];
-    layoutEntry.visibility = visibilities[i % visibilities.length];
-    layoutEntry[resourceTypes[i]] = resourceLayouts[i];
-    layoutEntries.push(layoutEntry);
+    layoutEntries.push({
+      binding: bindings[i],
+      visibility: visibilities[i % visibilities.length],
+      [resourceTypes[i]]: resourceLayouts[i],
+    });
   }
 
+  // Apply entry layouts to bindGroupLayout
   const bindGroupLayout = device.createBindGroupLayout({
     label: `${label}.bindGroupLayout`,
     entries: layoutEntries,
   });
 
+  // Create bindGroups that conform to the layout
   const bindGroups: GPUBindGroup[] = [];
   for (let i = 0; i < resources.length; i++) {
     const groupEntries: GPUBindGroupEntry[] = [];
     for (let j = 0; j < resources[0].length; j++) {
-      const groupEntry: any = {};
-      groupEntry.binding = j;
-      groupEntry.resource = resources[i][j];
-      groupEntries.push(groupEntry);
+      groupEntries.push({
+        binding: j,
+        resource: resources[i][j]
+      });
     }
     const newBindGroup = device.createBindGroup({
       label: `${label}.bindGroup${i}`,