@woosh/meep-engine 2.33.61 → 2.33.62

package/editor/actions/concrete/PaintTerrainOverlayAction.js

@@ -1,6 +1,6 @@
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import Vector4 from "../../../core/geom/Vector4.js";
 import { Action } from "../../../core/process/undo/Action.js";
+import { obtainTerrain } from "../../../engine/ecs/terrain/util/obtainTerrain.js";
 
 class PaintTerrainOverlayAction extends Action {
     /**

package/editor/process/ObstacleGridDisplayProcess.js

@@ -1,8 +1,8 @@
 import { EditorProcess } from "./EditorProcess.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import GridObstacle from "../../engine/grid/components/GridObstacle.js";
 import GridPosition from "../../engine/grid/components/GridPosition.js";
 import { Sampler2D } from "../../engine/graphics/texture/sampler/Sampler2D.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
 
 class ObstacleGridDisplayProcess extends EditorProcess {
 

package/editor/process/symbolic/makeGridPositionSymbolDisplay.js

@@ -4,7 +4,6 @@ import Task from "../../../core/process/task/Task.js";
 import TaskSignal from "../../../core/process/task/TaskSignal.js";
 import EntityBuilder from "../../../engine/ecs/EntityBuilder.js";
 import { BufferGeometry, Float32BufferAttribute, Line, LineBasicMaterial } from "three";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import Renderable from "../../../engine/ecs/components/Renderable.js";
 import { SurfacePoint3 } from "../../../core/geom/3d/SurfacePoint3.js";
 import Vector3 from "../../../core/geom/Vector3.js";
@@ -14,6 +13,7 @@ import { EventType } from "../../../engine/ecs/EntityManager.js";
 import { make3DSymbolicDisplay } from "./make3DSymbolicDisplay.js";
 import GridPosition from "../../../engine/grid/components/GridPosition.js";
 import { ProcessState } from "../../../core/process/ProcessState.js";
+import { obtainTerrain } from "../../../engine/ecs/terrain/util/obtainTerrain.js";
 
 /**
  *

package/editor/tools/FoliagePaintTool.js

@@ -1,12 +1,12 @@
 import Tool from "./engine/Tool.js";
 import Vector1 from "../../core/geom/Vector1.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import ObservedValue from "../../core/model/ObservedValue.js";
 import Vector4 from "../../core/geom/Vector4.js";
 import loadSampler2D from "../../engine/graphics/texture/sampler/loadSampler2D.js";
 import convertSampler2D2Canvas from "../../engine/graphics/texture/sampler/Sampler2D2Canvas.js";
 import { InstancedMeshComponent } from "../../engine/ecs/foliage/ecs/InstancedMeshComponent.js";
 import { parseHex } from "../../core/color/parseHex.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
 
 class FoliagePaintTool extends Tool {
     constructor() {

package/editor/tools/GridPaintTool.js

@@ -6,12 +6,12 @@ import Vector4 from "../../core/geom/Vector4.js";
 import ObservedValue from "../../core/model/ObservedValue.js";
 import Vector1 from "../../core/geom/Vector1.js";
 import WriteGridValueAction from "../actions/concrete/WriteGridValueAction.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import PaintTerrainOverlayAction from "../actions/concrete/PaintTerrainOverlayAction.js";
 import { decodeMouseEventButtons, PointerDevice } from "../../engine/input/devices/PointerDevice.js";
 import Vector2 from "../../core/geom/Vector2.js";
 import TopDownCameraControllerSystem from "../../engine/graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
 import { parseHex } from "../../core/color/parseHex.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
 
 class GridPaintTool extends Tool {
     constructor() {

package/editor/tools/paint/TerrainPaintTool.js

@@ -1,7 +1,6 @@
 import { max2 } from "../../../core/math/max2.js";
 import Tool from "../engine/Tool.js";
 import { Color } from "../../../core/color/Color.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
 import Vector2 from "../../../core/geom/Vector2.js";
 import { pick } from "../../../../model/game/util/ScreenGridPicker.js";
@@ -9,6 +8,7 @@ import convertSampler2D2Canvas from "../../../engine/graphics/texture/sampler/Sa
 import ObservedString from "../../../core/model/ObservedString.js";
 import { GameAssetType } from "../../../engine/asset/GameAssetType.js";
 import Vector1 from "../../../core/geom/Vector1.js";
+import { obtainTerrain } from "../../../engine/ecs/terrain/util/obtainTerrain.js";
 
 export class TerrainPaintTool extends Tool {
     constructor() {

package/editor/tools/paint/TerrainTexturePaintTool.js

@@ -4,7 +4,7 @@ import { TerrainPaintTool } from "./TerrainPaintTool.js";
 import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
 import { PatchTerrainTextureAction } from "../../actions/concrete/PatchTerrainTextureAction.js";
 import { convertSampler2D2DataURL } from "../../../engine/graphics/texture/sampler/convertSampler2D2DataURL.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
+import { obtainTerrain } from "../../../engine/ecs/terrain/util/obtainTerrain.js";
 
 export class TerrainTexturePaintTool extends TerrainPaintTool {
     constructor() {

package/editor/view/EditorView.js

@@ -22,7 +22,6 @@ import MeshLibraryView from "./library/MeshLibraryView.js";
 import BottomLeftResizeHandleView from "../../view/elements/BottomLeftResizeHandleView.js";
 import Vector2 from "../../core/geom/Vector2.js";
 import Vector3 from "../../core/geom/Vector3.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import Mesh from "../../engine/graphics/ecs/mesh/Mesh.js";
 import { Transform } from "../../engine/ecs/transform/Transform.js";
 import SelectionClearAction from "../actions/concrete/SelectionClearAction.js";
@@ -32,6 +31,7 @@ import SelectionAddAction from "../actions/concrete/SelectionAddAction.js";
 import { noop, passThrough } from "../../core/function/Functions.js";
 import { ProcessState } from "../../core/process/ProcessState.js";
 import { MeshEvents } from "../../engine/graphics/ecs/mesh/MeshEvents.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
 
 class ViewManager extends View {
     constructor() {

package/editor/view/GridPickCoordinateView.js

@@ -1,8 +1,8 @@
 import View from "../../view/View.js";
 import { pick } from "../../../model/game/util/ScreenGridPicker.js";
-import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import domify from "../../view/DOM.js";
 import { PointerDevice } from "../../engine/input/devices/PointerDevice.js";
+import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
 
 class GridPickCoordinateView extends View {
     /**

package/engine/ecs/animation/InverseKinematicsSystem.js

@@ -3,9 +3,9 @@ import { InverseKinematics } from "./InverseKinematics.js";
 import Mesh, { MeshFlags } from "../../graphics/ecs/mesh/Mesh.js";
 import { TwoBoneInverseKinematicsSolver } from "./TwoBoneInverseKinematicsSolver.js";
 import { extractSkeletonFromMeshComponent } from "../../graphics/ecs/mesh/SkeletonUtils.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import { OneBoneSurfaceAlignmentSolver } from "./OneBoneSurfaceAlignmentSolver.js";
 import { IKProblem } from "./IKProblem.js";
+import { obtainTerrain } from "../terrain/util/obtainTerrain.js";
 
 
 export class InverseKinematicsSystem extends System {

package/engine/ecs/evaluation/world/ReadTerrainLayerWeightPointFitness.js

@@ -1,8 +1,8 @@
 import { PointFitnessFunction } from "../PointFitnessFunction.js";
-import { obtainTerrain } from "../../../../../model/game/scenes/SceneUtils.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
 import Vector2 from "../../../../core/geom/Vector2.js";
 import { assert } from "../../../../core/assert.js";
+import { obtainTerrain } from "../../terrain/util/obtainTerrain.js";
 
 
 const v3 = new Vector3();

package/engine/ecs/fow/FogOfWarRevealerSystem.js

@@ -4,8 +4,8 @@ import { SignalBinding } from "../../../core/events/signal/SignalBinding.js";
 import { FogOfWar } from "./FogOfWar.js";
 import Team from "../../../../model/game/ecs/component/Team.js";
 import { Transform } from "../transform/Transform.js";
-import { obtainTerrain } from "../../../../model/game/scenes/SceneUtils.js";
 import Vector2 from "../../../core/geom/Vector2.js";
+import { obtainTerrain } from "../terrain/util/obtainTerrain.js";
 
 const v2 = new Vector2();
 

package/engine/ecs/terrain/ecs/ClingToTerrainSystem.js

@@ -9,13 +9,13 @@ import { Transform } from '../../transform/Transform.js';
 import ClingToTerrain from './ClingToTerrain.js';
 
 import Vector3 from '../../../../core/geom/Vector3.js';
-import { obtainTerrain } from "../../../../../model/game/scenes/SceneUtils.js";
 import Quaternion from "../../../../core/geom/Quaternion.js";
-import { EPSILON} from "../../../../core/math/MathUtils.js";
+import { EPSILON } from "../../../../core/math/MathUtils.js";
 import { Matrix4 } from "three";
 import { assert } from "../../../../core/assert.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
 import { Deque } from "../../../../core/collection/queue/Deque.js";
+import { obtainTerrain } from "../util/obtainTerrain.js";
 
 
 /**

package/engine/ecs/terrain/util/loadVisibleTerrainTiles.js

@@ -0,0 +1,112 @@
+import TopDownCameraControllerSystem from "../../../graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
+import { Camera } from "../../../graphics/ecs/camera/Camera.js";
+import { obtainTerrain } from "./obtainTerrain.js";
+import { assert } from "../../../../core/assert.js";
+import TerrainSystem from "../ecs/TerrainSystem.js";
+import Task from "../../../../core/process/task/Task.js";
+import TaskSignal from "../../../../core/process/task/TaskSignal.js";
+
+/**
+ *
+ * @param {EntityManager} em
+ * @param {EntityComponentDataset} ecd
+ * @returns {Task}
+ */
+export function loadVisibleTerrainTiles(em, ecd) {
+
+    let totalTiles = 0;
+    let loadedTiles = 0;
+    let failedTiles = 0;
+
+    let attempt = 0;
+
+    let failureFlag = false;
+
+    function init() {
+        const attemptId = attempt;
+
+        //force update by camera controller, to ensure correct focus is set
+        em.getSystem(TopDownCameraControllerSystem).update(0);
+
+        ecd.traverseComponents(Camera, function (c) {
+            c.updateMatrices();
+        });
+
+        const tiles = [];
+
+        const terrain = obtainTerrain(ecd);
+
+        assert.notEqual(terrain, null, 'terrain not found');
+
+        TerrainSystem.traverseVisibleTiles(ecd, terrain, function (tile) {
+            tiles.push(tile);
+        });
+
+        totalTiles = tiles.length;
+        const tileManager = terrain.tiles;
+
+        function handleObtainedTile(t) {
+            if (attemptId !== attempt) {
+                return;
+            }
+
+            loadedTiles++;
+        }
+
+        function handleFailedTile(t) {
+            if (attemptId !== attempt) {
+                return;
+            }
+
+            attempt++;
+
+            failedTiles++;
+
+            if (attempt < 10) {
+                init();
+            } else {
+                failureFlag = true;
+            }
+        }
+
+        if (totalTiles !== 0) {
+            tiles.forEach(function (tile) {
+                tileManager.obtain(tile.gridPosition.x, tile.gridPosition.y).then(handleObtainedTile, handleFailedTile);
+            });
+        }
+    }
+
+    const task = new Task({
+        name: "Building visible terrain tiles",
+
+        initializer: init,
+
+        cycleFunction() {
+            if (failureFlag) {
+                return TaskSignal.EndFailure;
+            }
+
+            if (loadedTiles >= totalTiles) {
+                return TaskSignal.EndSuccess;
+            } else {
+                return TaskSignal.Yield;
+            }
+        },
+
+        computeProgress() {
+            if (totalTiles === 0) {
+                return 0;
+            }
+
+            const f = loadedTiles / totalTiles;
+
+            if (f >= 1) {
+                return 1;
+            }
+
+            return f;
+        }
+    });
+
+    return task;
+}

package/engine/ecs/terrain/util/obtainTerrain.js

@@ -0,0 +1,23 @@
+import { assert } from "../../../../core/assert.js";
+import Terrain from "../ecs/Terrain.js";
+
+/**
+ *
+ * @param {EntityComponentDataset} ecd
+ * @param {function(terrain:Terrain,entity:number)} [callback]
+ * @returns {Terrain|null}
+ */
+export function obtainTerrain(ecd, callback) {
+    assert.notEqual(ecd, null, 'ecd is null');
+    assert.notEqual(ecd, undefined, 'ecd is undefined');
+
+    const object = ecd.getAnyComponent(Terrain);
+
+    const terrain = object.component;
+
+    if (terrain !== null && typeof callback === "function") {
+        callback(terrain, object.entity);
+    }
+
+    return terrain;
+}

package/engine/graphics/ecs/camera/topdown/TopDownCameraLanderSystem.js

@@ -2,11 +2,11 @@ import { clamp } from "../../../../../core/math/clamp.js";
 import { System } from "../../../../ecs/System.js";
 import { TopDownCameraLander } from "./TopDownCameraLander.js";
 import { Cache } from "../../../../../core/cache/Cache.js";
-import { obtainTerrain } from "../../../../../../model/game/scenes/SceneUtils.js";
 import { buildCameraTargetSampler } from "../../../../input/ecs/util/TerrainCameraTargetSampler.js";
 import TopDownCameraController from "./TopDownCameraController.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
 import { SignalBinding } from "../../../../../core/events/signal/SignalBinding.js";
+import { obtainTerrain } from "../../../../ecs/terrain/util/obtainTerrain.js";
 
 
 /**

package/engine/graphics/ecs/water/WaterSystem.js

@@ -8,10 +8,10 @@ import { LeafNode } from '../../../../core/bvh2/LeafNode.js';
 import { buildPlanarRenderLayerClipPlaneComputationMethod } from "../../render/layers/RenderLayerUtils.js";
 import ThreeFactory from "../../three/ThreeFactory.js";
 import { RenderPassType } from "../../render/RenderPassType.js";
-import { obtainTerrain } from "../../../../../model/game/scenes/SceneUtils.js";
 import { makeAlexWaterMaterial } from "../water2/shader/AlexWaterShader.js";
 import { threeUpdateTransform } from "../../util/threeUpdateTransform.js";
 import { StandardFrameBuffers } from "../../StandardFrameBuffers.js";
+import { obtainTerrain } from "../../../ecs/terrain/util/obtainTerrain.js";
 
 const WATER_SIZE = 800;
 

package/engine/graphics/ecs/water2/shader/testWaterShader.js

@@ -1,4 +1,3 @@
-import { obtainTerrain } from "../../../../../../model/game/scenes/SceneUtils.js";
 import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
 import { EngineConfiguration } from "../../../../EngineConfiguration.js";
 import ScriptSystem from "../../../../ecs/systems/ScriptSystem.js";
@@ -28,6 +27,7 @@ import { EngineHarness } from "../../../../EngineHarness.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
 import Vector3 from "../../../../../core/geom/Vector3.js";
 import SimplexNoise from 'simplex-noise';
+import { obtainTerrain } from "../../../../ecs/terrain/util/obtainTerrain.js";
 
 const engineHarness = new EngineHarness();
 

package/engine/graphics/particles/particular/engine/utils/volume/prototypeParticleVolume.js

@@ -43,7 +43,6 @@ import { ActionBehavior } from "../../../../../../intelligence/behavior/primitiv
 import { pingpong } from "../../../../../../../core/math/pingpong.js";
 import { ParameterLookupTable } from "../../parameter/ParameterLookupTable.js";
 import { pick } from "../../../../../../../../model/game/util/ScreenGridPicker.js";
-import { obtainTerrain } from "../../../../../../../../model/game/scenes/SceneUtils.js";
 import GUIElement from "../../../../../../ecs/gui/GUIElement.js";
 import EmptyView from "../../../../../../../view/elements/EmptyView.js";
 import HeadsUpDisplay from "../../../../../../ecs/gui/hud/HeadsUpDisplay.js";
@@ -77,6 +76,7 @@ import { UnitSphereShape3D } from "../../../../../../../core/geom/3d/shape/UnitS
 import TopDownCameraController from "../../../../../ecs/camera/topdown/TopDownCameraController.js";
 import { randomFloatBetween } from "../../../../../../../core/math/random/randomFloatBetween.js";
 import { MicronRenderPlugin } from "../../../../../micron/plugin/MicronRenderPlugin.js";
+import { obtainTerrain } from "../../../../../../ecs/terrain/util/obtainTerrain.js";
 
 const engineHarness = new EngineHarness();
 

package/engine/graphics/render/forward_plus/plugin/ptototypeFPPlugin.js

@@ -69,7 +69,6 @@ import Renderable from "../../../../ecs/components/Renderable.js";
 import { makeHelperSphereGeometry } from "../../../../../editor/process/symbolic/makeHelperSphereGeometry.js";
 import TopDownCameraController from "../../../ecs/camera/topdown/TopDownCameraController.js";
 import ThreeFactory from "../../../three/ThreeFactory.js";
-import { obtainTerrain } from "../../../../../../model/game/scenes/SceneUtils.js";
 import { JsonAssetLoader } from "../../../../asset/loaders/JsonAssetLoader.js";
 import { TextureAssetLoader } from "../../../../asset/loaders/texture/TextureAssetLoader.js";
 import { GameAssetType } from "../../../../asset/GameAssetType.js";
@@ -83,6 +82,7 @@ import { FogOfWar } from "../../../../ecs/fow/FogOfWar.js";
 import { FogOfWarRevealer } from "../../../../ecs/fow/FogOfWarRevealer.js";
 import Team from "../../../../../../model/game/ecs/component/Team.js";
 import { AmbientOcclusionPostProcessEffect } from "../../buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
+import { obtainTerrain } from "../../../../ecs/terrain/util/obtainTerrain.js";
 
 const geo_light_center_octahedron = new BoxBufferGeometry(0.1, 0.1, 0.1);
 const engineHarness = new EngineHarness();

package/engine/graphics/render/webgpu/sample/MeshInstance.js

@@ -0,0 +1,87 @@
+import { array_copy } from "../../../../../core/collection/array/copyArray.js";
+
+export class MeshInstance {
+    constructor() {
+
+        /**
+         *
+         * @type {THREE.BufferGeometry|null}
+         */
+        this.geometry = null;
+
+        /**
+         *
+         * @type {GPUBuffer|null}
+         */
+        this.vertex_buffer = null;
+
+        /**
+         *
+         * @type {GPUBuffer|null}
+         */
+        this.index_buffer = null;
+    }
+
+    /**
+     *
+     * @param {GPUDevice} device
+     */
+    init(device) {
+        const mesh = this.geometry;
+
+        const kVertexStride = 8;
+        const attribute_position = mesh.getAttribute('position');
+        const vertexBuffer = device.createBuffer({
+            // position: vec3, normal: vec3, uv: vec2
+            size: attribute_position.array.length * kVertexStride * Float32Array.BYTES_PER_ELEMENT,
+            usage: GPUBufferUsage.VERTEX,
+            mappedAtCreation: true,
+        });
+
+        {
+            const mapping = new Float32Array(vertexBuffer.getMappedRange());
+
+            const attribute_normal = mesh.getAttribute('normal');
+            const attribute_uv = mesh.getAttribute('uv');
+
+            const vertex_count = attribute_position.count;
+
+            for (let i = 0; i < vertex_count; ++i) {
+                const address = kVertexStride * i;
+                array_copy(attribute_position.array, i * 3, mapping, address, 3);
+                array_copy(attribute_normal.array, i * 3, mapping, address + 3, 3);
+                array_copy(attribute_uv.array, i * 2, mapping, address + 6, 2);
+            }
+            vertexBuffer.unmap();
+        }
+
+        this.vertex_buffer = vertexBuffer;
+
+        const indexCount = mesh.getIndex().array.length;
+        const indexBuffer = device.createBuffer({
+            size: indexCount * Uint32Array.BYTES_PER_ELEMENT,
+            usage: GPUBufferUsage.INDEX,
+            mappedAtCreation: true,
+        });
+        {
+            const mapping = new Uint32Array(indexBuffer.getMappedRange());
+
+            mapping.set(mesh.getIndex().array);
+
+            indexBuffer.unmap();
+        }
+
+        this.index_buffer = indexBuffer;
+
+    }
+
+    /**
+     *
+     * @param {GPURenderPassEncoder} pass
+     */
+    draw(pass) {
+        pass.setVertexBuffer(0, this.vertex_buffer);
+        pass.setIndexBuffer(this.index_buffer, 'uint32');
+        pass.drawIndexed(this.geometry.getIndex().array.length);
+    }
+}

package/engine/graphics/render/webgpu/sample/fragmentDeferredRendering.wgsl

@@ -7,19 +7,23 @@ struct LightData {
   color : vec3<f32>;
   radius : f32;
 };
-[[block]] struct LightsBuffer {
+
+struct LightsBuffer {
   lights: array<LightData>;
 };
+
 [[group(1), binding(0)]] var<storage, read> lightsBuffer: LightsBuffer;
 
-[[block]] struct Config {
+struct Config {
   numLights : u32;
 };
+
 [[group(1), binding(1)]] var<uniform> config: Config;
 
-[[block]] struct CanvasConstants {
+struct CanvasConstants {
   size: vec2<f32>;
 };
+
 [[group(2), binding(0)]] var<uniform> canvas : CanvasConstants;
 
 [[stage(fragment)]]

package/engine/graphics/render/webgpu/sample/fragmentGBuffersDebugView.wgsl

@@ -2,9 +2,10 @@
 [[group(0), binding(1)]] var gBufferNormal: texture_2d<f32>;
 [[group(0), binding(2)]] var gBufferAlbedo: texture_2d<f32>;
 
-[[block]] struct CanvasConstants {
+struct CanvasConstants {
   size: vec2<f32>;
 };
+
 [[group(1), binding(0)]] var<uniform> canvas : CanvasConstants;
 
 [[stage(fragment)]]
@@ -18,7 +19,7 @@ fn main([[builtin(position)]] coord : vec4<f32>)
       vec2<i32>(floor(coord.xy)),
       0
     );
-  } elseif (c.x < 0.66667) {
+  } else if (c.x < 0.66667) {
     result = textureLoad(
       gBufferNormal,
       vec2<i32>(floor(coord.xy)),
@@ -35,4 +36,4 @@ fn main([[builtin(position)]] coord : vec4<f32>)
     );
   }
   return result;
-}
+}

package/engine/graphics/render/webgpu/sample/lightUpdate.wgsl

@@ -3,20 +3,22 @@ struct LightData {
   color : vec3<f32>;
   radius : f32;
 };
-[[block]] struct LightsBuffer {
+struct LightsBuffer {
   lights: array<LightData>;
 };
 [[group(0), binding(0)]] var<storage, read_write> lightsBuffer: LightsBuffer;
 
-[[block]] struct Config {
+struct Config {
   numLights : u32;
 };
+
 [[group(0), binding(1)]] var<uniform> config: Config;
 
-[[block]] struct LightExtent {
+struct LightExtent {
   min : vec4<f32>;
   max : vec4<f32>;
 };
+
 [[group(0), binding(2)]] var<uniform> lightExtent: LightExtent;
 
 [[stage(compute), workgroup_size(64, 1, 1)]]
@@ -26,9 +28,14 @@ fn main([[builtin(global_invocation_id)]] GlobalInvocationID : vec3<u32>) {
     return;
   }
 
-  lightsBuffer.lights[index].position.y = lightsBuffer.lights[index].position.y - 0.5 - 0.003 * (f32(index) - 64.0 * floor(f32(index) / 64.0));
+  let light = &lightsBuffer.lights[index];
 
-  if (lightsBuffer.lights[index].position.y < lightExtent.min.y) {
-    lightsBuffer.lights[index].position.y = lightExtent.max.y;
+  (*light).position.y = (*light).position.y - 0.001 - 0.003 * (f32(index) - 64.0 * floor(f32(index) / 64.0));
+
+  if ((*light).position.y < lightExtent.min.y) {
+    (*light).position.y = lightExtent.max.y;
   }
+
+  // write out
+//  lightBuffer.lighs[index] = light;
 }