@woosh/meep-engine 2.119.73 → 2.119.75
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/engine/EngineHarness.d.ts.map +1 -1
- package/src/engine/EngineHarness.js +1 -2
- package/src/engine/ecs/terrain/ecs/layers/TerrainLayers.d.ts.map +1 -1
- package/src/engine/ecs/terrain/ecs/layers/TerrainLayers.js +9 -2
- package/src/engine/ecs/terrain/ecs/splat/SplatMapping.d.ts +2 -2
- package/src/engine/ecs/terrain/ecs/splat/SplatMapping.d.ts.map +1 -1
- package/src/engine/ecs/terrain/ecs/splat/SplatMapping.js +8 -3
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EngineHarness.d.ts","sourceRoot":"","sources":["../../../src/engine/EngineHarness.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EngineHarness.d.ts","sourceRoot":"","sources":["../../../src/engine/EngineHarness.js"],"names":[],"mappings":"AA6DA;IAmBI;;;;OAIG;IACH,8CAHmB,mBAAmB,UAAQ,MAAM,WACxC,QAAQ,MAAM,CAAC,CAM1B;IAED;;;OAGG;IACH,6BAFW,MAAM,QAYhB;IAmED;;;;;;;;;;;;;OAaG;IACH;QAZyB,MAAM,EAApB,MAAM;QACyB,GAAG;QAClB,MAAM,GAAtB,OAAO;QACQ,QAAQ,GAAvB,MAAM;QACS,KAAK,GAApB,MAAM;QACS,GAAG,GAAlB,MAAM;QACU,QAAQ,GAAxB,OAAO;QACQ,WAAW,GAA1B,MAAM;QACS,WAAW,GAA1B,MAAM;QACS,WAAW,GAA1B,MAAM;QACJ,MAAM,CA+DlB;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH;QApB0B,MAAM,EAArB,MAAM;QACgC,KAAK,GAA3C;YAAC,CAAC,EAAC,MAAM,CAAC;YAAA,CAAC,EAAC,MAAM,CAAC;YAAA,CAAC,EAAC,MAAM,CAAA;SAAC;QACrB,SAAS;QACT,WAAW;QACF,KAAK,GAArB,MAAM;QACU,GAAG,GAAnB,MAAM;QACU,QAAQ,GAAxB,MAAM;QACwB,WAAW,GAAzC;YAAC,CAAC,EAAC,MAAM,CAAC;YAAC,CAAC,EAAC,MAAM,CAAA;SAAC;QACJ,iBAAiB,GAAjC,MAAM;QACW,WAAW,GAA5B,OAAO;QACU,aAAa,GAA9B,OAAO;QACU,YAAY,GAA7B,OAAO;QACU,aAAa,GAA9B,OAAO;QACS,iBAAiB,GAAjC,MAAM;QACU,iBAAiB,GAAjC,MAAM;QACW,gBAAgB,GAAjC,OAAO;QACU,cAAc,GAA/B,OAAO;QACS,mBAAmB,GAAnC,MAAM;QACW,OAAO,GAAxB,OAAO;sBA0EjB;IAGD;;;;;;;;;;;OAWG;IACH;QAVyB,MAAM,EAApB,MAAM;QACyB,GAAG;QACnB,mBAAmB,GAAlC,MAAM;QACU,UAAU,GAA1B,OAAO;QACO,GAAG,GAAjB,KAAK;QACU,YAAY,GAA3B,MAAM;QACU,YAAY,GAA5B,OAAO;QACO,OAAO,GAArB,KAAK;QACU,gBAAgB,GAA/B,MAAM;sBAqDhB;IAED;;;;;;;OAOG;IACH;QAN0B,YAAY,GAA3B,MAAM;QACQ,MAAM,EAApB,MAAM;QACS,WAAW,GAA1B,MAAM;QACyB,GAAG;QAChC,QAAQ,MAAM,CAAC,CA2C3B;IAGD;;;;;;;;;;OAUG;IACH,sFATW,MAAM,GAOJ,OAAO,CAsDnB;IA/cG;;;OAGG;IACH,QAFU,MAAM,CAEiC;IAMjD;;;OAGG;IACH,YAFU,eAAQ,IAAI,CAET;IA8BjB;;;;;OAKG;IACH;iCAJmB,mBAAmB,UAAQ,MAAM;8BACzC,OAAO;QACL,QAAQ,MAAM,CAAC,CA2D3B;CAqWJ;;IAID;;;OAGG;IACH,uCAMC;;mBA9gBkB,aAAa;oCACI,0BAA0B;oBAX1C,yBAAyB;mBAK1B,iBAAiB;sBATd,wBAAwB;oBAW1B,8BAA8B"}
|
|
@@ -24,7 +24,6 @@ import { Light } from "./graphics/ecs/light/Light.js";
|
|
|
24
24
|
import LightSystem from "./graphics/ecs/light/LightSystem.js";
|
|
25
25
|
import Water from "./graphics/ecs/water/Water.js";
|
|
26
26
|
import WaterSystem from "./graphics/ecs/water/WaterSystem.js";
|
|
27
|
-
import checkersTextureURI from "./graphics/texture/CheckersTextureURI.js";
|
|
28
27
|
import { MouseEvents } from "./input/devices/events/MouseEvents.js";
|
|
29
28
|
import KeyboardCameraController from "./input/ecs/controllers/KeyboardCameraController.js";
|
|
30
29
|
import InputControllerSystem from "./input/ecs/systems/InputControllerSystem.js";
|
|
@@ -477,7 +476,7 @@ export class EngineHarness {
|
|
|
477
476
|
{
|
|
478
477
|
engine,
|
|
479
478
|
size = new Vector2(10, 10),
|
|
480
|
-
diffuse0 =
|
|
479
|
+
diffuse0 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAA1JREFUGFdj+P///38ACfsD/QVDRcoAAAAASUVORK5CYII=",
|
|
481
480
|
resolution = 10,
|
|
482
481
|
waterLevel = 0,
|
|
483
482
|
enableWater = true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerrainLayers.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/ecs/terrain/ecs/layers/TerrainLayers.js"],"names":[],"mappings":"AA6EA;IAGQ;;;OAGG;IACH,QAFU,KAAK,YAAY,CAAC,CAEJ;IAExB;;;OAGG;IACH,YAFU,OAAO,CAEoD;
|
|
1
|
+
{"version":3,"file":"TerrainLayers.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/ecs/terrain/ecs/layers/TerrainLayers.js"],"names":[],"mappings":"AA6EA;IAGQ;;;OAGG;IACH,QAFU,KAAK,YAAY,CAAC,CAEJ;IAExB;;;OAGG;IACH,YAFU,OAAO,CAEoD;IAMrE;;;OAGG;IACH,SAFU,kBAAkB,CAE8B;IAiB1D,2BAAsF;IAc1F;;;MAKC;IAED;;;aAGC;IAED;;;;OAIG;IACH,gCAHW,MAAM,iBACN,MAAM,QAuChB;IAED;;;;OAIG;IACH,0DAyBC;IAED,sCAIC;IAED;;;;OAIG;IACH,WAHW,MAAM,GACL,YAAY,CAIvB;IAED;;;;OAIG;IACH,8DAFa,MAAM,CAqBlB;IAED;;;;OAIG;IACH,kCAHW,MAAM,GACJ,MAAM,CAMlB;IAED;;;OAGG;IACH,SAFY,MAAM,CAIjB;IAED;;;;OAIG;IACH,gBAHW,YAAY,GACV,MAAM,CAWlB;IAED;;;;OAIG;IACH,mBAHW,YAAY,GACX,OAAO,CAIlB;IAED;;;;;;OAMG;IACH,0CA8BC;IAED;;;OAGG;IACH,iCAFW,MAAM,QAgChB;IAED,gBAGC;IAED,cAEC;IAGD,qBAsCC;CACJ;iBA5ZgB,6CAA6C;6BAQjC,mBAAmB;oBAP5B,qCAAqC;mCALlD,OAAO;4BAAP,OAAO"}
|
|
@@ -36,7 +36,7 @@ class ScaledTextureKey {
|
|
|
36
36
|
* @returns {ScaledTextureKey}
|
|
37
37
|
*/
|
|
38
38
|
static from(uri, size) {
|
|
39
|
-
assert.isString(uri,
|
|
39
|
+
assert.isString(uri, 'uri');
|
|
40
40
|
|
|
41
41
|
const r = new ScaledTextureKey();
|
|
42
42
|
|
|
@@ -90,11 +90,15 @@ export class TerrainLayers {
|
|
|
90
90
|
*/
|
|
91
91
|
this.resolution = new Vector2(DEFAULT_RESOLUTION, DEFAULT_RESOLUTION);
|
|
92
92
|
|
|
93
|
+
|
|
94
|
+
const layer_data = new Uint8Array(3);
|
|
95
|
+
layer_data.fill(255); //pre-fill with white
|
|
96
|
+
|
|
93
97
|
/**
|
|
94
98
|
*
|
|
95
99
|
* @type {DataTexture2DArray}
|
|
96
100
|
*/
|
|
97
|
-
this.texture = new DataTexture2DArray(
|
|
101
|
+
this.texture = new DataTexture2DArray(layer_data, 1, 1, 1);
|
|
98
102
|
this.texture.format = GL_RGBFormat;
|
|
99
103
|
this.texture.type = UnsignedByteType;
|
|
100
104
|
|
|
@@ -109,6 +113,7 @@ export class TerrainLayers {
|
|
|
109
113
|
this.texture.generateMipmaps = true;
|
|
110
114
|
this.texture.encoding = LinearEncoding;
|
|
111
115
|
this.texture.internalFormat = 'RGB8';
|
|
116
|
+
this.texture.needsUpdate = true;
|
|
112
117
|
|
|
113
118
|
this.scalesTexture = new DataTexture(new Float32Array(64), 32, 1, RGFormat, FloatType);
|
|
114
119
|
|
|
@@ -121,6 +126,7 @@ export class TerrainLayers {
|
|
|
121
126
|
this.scalesTexture.internalFormat = 'RG32F';
|
|
122
127
|
|
|
123
128
|
this.scalesTexture.generateMipmaps = false;
|
|
129
|
+
this.scalesTexture.needsUpdate = true;
|
|
124
130
|
}
|
|
125
131
|
|
|
126
132
|
toJSON() {
|
|
@@ -406,6 +412,7 @@ export class TerrainLayers {
|
|
|
406
412
|
|
|
407
413
|
//build an array to hold texture array
|
|
408
414
|
const arrayData = new Uint8Array(size_x * size_y * 3 * layerCount);
|
|
415
|
+
arrayData.fill(255); // fill with white
|
|
409
416
|
|
|
410
417
|
if (image.width === size_x && image.height === size_y) {
|
|
411
418
|
// dimensions preserved, copy old data
|
|
@@ -116,10 +116,10 @@ export class SplatMapping {
|
|
|
116
116
|
removeWeightLayer(index: number): boolean;
|
|
117
117
|
/**
|
|
118
118
|
*
|
|
119
|
-
* @param {number}
|
|
119
|
+
* @param {number} layer_index
|
|
120
120
|
* @param {number} value
|
|
121
121
|
*/
|
|
122
|
-
fillLayerWeights(
|
|
122
|
+
fillLayerWeights(layer_index: number, value: number): void;
|
|
123
123
|
addWeightLayer(): void;
|
|
124
124
|
/**
|
|
125
125
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SplatMapping.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/ecs/terrain/ecs/splat/SplatMapping.js"],"names":[],"mappings":"AAaA;;GAEG;AACH;IAEQ;;;OAGG;IACH,MAFU,OAAO,CAEY;IAE7B;;;OAGG;IACH,OAFU,MAAM,CAEF;IAOd;;;OAGG;IACH,eAFU,kBAAkB,CAEiE;IAO7F;;;;OAIG;IACH,iBAFU,WAAW,CAEoE;IAG7F;;;;MAQC;IAED;;;;;;;aA6BC;IAED;;;;;OAKG;IACH,8BAJW,SAAS,SACT,MAAM,YACN,MAAM,QAgChB;IAED;;;;;OAKG;IACH,gCAJW,SAAS,SACT,MAAM,YACN,MAAM,QA2BhB;IAED;;;;;;;OAOG;IACH,wBANW,UAAU,gBACV,MAAM,gBACN,MAAM,eACN,MAAM,gBACN,MAAM,QA2ChB;IAED;;;;;;;OAOG;IACH,4BANW,UAAU,WACV,MAAM,WACN,MAAM,SACN,MAAM,UACN,MAAM,QAuChB;IAED;;;;;;OAMG;IACH,gBALW,MAAM,KACN,MAAM,iBACN,MAAM,GACJ,MAAM,CAKlB;IAED;;;;OAIG;IACH,6BAHW,MAAM,GACJ,SAAS,CAcrB;IAED;;OAEG;IACH,iDAEC;IAED;;;OAGG;IACH,mDAEC;IAED;;;OAGG;IACH,iCAEC;IAED;;;OAGG;IACH,YAFY,MAAM,CAKjB;IAED;;;;OAIG;IACH,gCAHW,UAAU,QAoDpB;IAED,gBAGC;IAED;;;;OAIG;IACH,yBAHW,MAAM,GACJ,OAAO,CAuCnB;IAED;;;;OAIG;IACH,
|
|
1
|
+
{"version":3,"file":"SplatMapping.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/ecs/terrain/ecs/splat/SplatMapping.js"],"names":[],"mappings":"AAaA;;GAEG;AACH;IAEQ;;;OAGG;IACH,MAFU,OAAO,CAEY;IAE7B;;;OAGG;IACH,OAFU,MAAM,CAEF;IAOd;;;OAGG;IACH,eAFU,kBAAkB,CAEiE;IAO7F;;;;OAIG;IACH,iBAFU,WAAW,CAEoE;IAG7F;;;;MAQC;IAED;;;;;;;aA6BC;IAED;;;;;OAKG;IACH,8BAJW,SAAS,SACT,MAAM,YACN,MAAM,QAgChB;IAED;;;;;OAKG;IACH,gCAJW,SAAS,SACT,MAAM,YACN,MAAM,QA2BhB;IAED;;;;;;;OAOG;IACH,wBANW,UAAU,gBACV,MAAM,gBACN,MAAM,eACN,MAAM,gBACN,MAAM,QA2ChB;IAED;;;;;;;OAOG;IACH,4BANW,UAAU,WACV,MAAM,WACN,MAAM,SACN,MAAM,UACN,MAAM,QAuChB;IAED;;;;;;OAMG;IACH,gBALW,MAAM,KACN,MAAM,iBACN,MAAM,GACJ,MAAM,CAKlB;IAED;;;;OAIG;IACH,6BAHW,MAAM,GACJ,SAAS,CAcrB;IAED;;OAEG;IACH,iDAEC;IAED;;;OAGG;IACH,mDAEC;IAED;;;OAGG;IACH,iCAEC;IAED;;;OAGG;IACH,YAFY,MAAM,CAKjB;IAED;;;;OAIG;IACH,gCAHW,UAAU,QAoDpB;IAED,gBAGC;IAED;;;;OAIG;IACH,yBAHW,MAAM,GACJ,OAAO,CAuCnB;IAED;;;;OAIG;IACH,8BAHW,MAAM,SACN,MAAM,QAqBhB;IAED,uBAiBC;IAED;;;;;;OAMG;IACH,cALW,MAAM,UACN,MAAM,SACN,MAAM,cACN,OAAO,QAsDjB;CACJ;oBAphBmB,qCAAqC;mCALiD,OAAO;4BAAP,OAAO;0BAUvF,mDAAmD"}
|
|
@@ -432,16 +432,19 @@ export class SplatMapping {
|
|
|
432
432
|
|
|
433
433
|
/**
|
|
434
434
|
*
|
|
435
|
-
* @param {number}
|
|
435
|
+
* @param {number} layer_index
|
|
436
436
|
* @param {number} value
|
|
437
437
|
*/
|
|
438
|
-
fillLayerWeights(
|
|
438
|
+
fillLayerWeights(layer_index, value) {
|
|
439
|
+
assert.isNonNegativeInteger(layer_index, 'layer_index');
|
|
440
|
+
assert.isNumber(value, 'value');
|
|
441
|
+
|
|
439
442
|
const w = this.size.x;
|
|
440
443
|
const h = this.size.y;
|
|
441
444
|
|
|
442
445
|
const layerSize = w * h;
|
|
443
446
|
|
|
444
|
-
const startAddress = layerSize *
|
|
447
|
+
const startAddress = layerSize * layer_index;
|
|
445
448
|
const endAddress = startAddress + layerSize;
|
|
446
449
|
|
|
447
450
|
const weightData = this.weightData;
|
|
@@ -449,6 +452,8 @@ export class SplatMapping {
|
|
|
449
452
|
for (let i = startAddress; i < endAddress; i++) {
|
|
450
453
|
weightData[i] = value;
|
|
451
454
|
}
|
|
455
|
+
|
|
456
|
+
this.weightTexture.needsUpdate = true;
|
|
452
457
|
}
|
|
453
458
|
|
|
454
459
|
addWeightLayer() {
|