fix use of platform.world
This commit is contained in:
parent
930e591c44
commit
fd645737e2
6 changed files with 9 additions and 8 deletions
|
|
@ -26,7 +26,7 @@ self.kiri.loader.push(function() {
|
||||||
CAM.animate_clear = function(api) {
|
CAM.animate_clear = function(api) {
|
||||||
KIRI.client.animate_cleanup();
|
KIRI.client.animate_cleanup();
|
||||||
SPACE = (API = api).const.SPACE;
|
SPACE = (API = api).const.SPACE;
|
||||||
WORLD = SPACE.platform.world;
|
WORLD = SPACE.world;
|
||||||
$('layer-animate').innerHTML = '';
|
$('layer-animate').innerHTML = '';
|
||||||
$('layer-toolpos').innerHTML = '';
|
$('layer-toolpos').innerHTML = '';
|
||||||
Object.keys(meshes).forEach(id => deleteMesh(id));
|
Object.keys(meshes).forEach(id => deleteMesh(id));
|
||||||
|
|
@ -35,7 +35,7 @@ self.kiri.loader.push(function() {
|
||||||
if (KIRI.client)
|
if (KIRI.client)
|
||||||
CAM.animate = function(api, delay) {
|
CAM.animate = function(api, delay) {
|
||||||
SPACE = (API = api).const.SPACE;
|
SPACE = (API = api).const.SPACE;
|
||||||
WORLD = SPACE.platform.world;
|
WORLD = SPACE.world;
|
||||||
KIRI.client.animate_setup(API.conf.get(), data => {
|
KIRI.client.animate_setup(API.conf.get(), data => {
|
||||||
checkMeshCommands(data);
|
checkMeshCommands(data);
|
||||||
if (!(data && data.mesh_add)) {
|
if (!(data && data.mesh_add)) {
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,7 @@
|
||||||
api.event.on("code.loaded", (info) => {
|
api.event.on("code.loaded", (info) => {
|
||||||
if (isCamMode && camStock) {
|
if (isCamMode && camStock) {
|
||||||
isParsed = true;
|
isParsed = true;
|
||||||
STACKS.getStack("parse", SPACE.platform.world).button("animate", animate);
|
STACKS.getStack("parse", SPACE.world).button("animate", animate);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1206,7 +1206,7 @@
|
||||||
tshadow = POLY.union(tshadow.slice().appendAll(data.tops).appendAll(shadowAt), 0.01, true);
|
tshadow = POLY.union(tshadow.slice().appendAll(data.tops).appendAll(shadowAt), 0.01, true);
|
||||||
tslices.push(data.slice);
|
tslices.push(data.slice);
|
||||||
data.slice.shadow = tshadow;
|
data.slice.shadow = tshadow;
|
||||||
if (true) {
|
if (false) {
|
||||||
const slice = data.slice;
|
const slice = data.slice;
|
||||||
sliceAll.push(slice);
|
sliceAll.push(slice);
|
||||||
slice.output()
|
slice.output()
|
||||||
|
|
|
||||||
|
|
@ -526,7 +526,7 @@
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
xpdebug = new KIRI.Stack(SPACE.platform.world, false);
|
xpdebug = new KIRI.Stack(SPACE.world, false);
|
||||||
xpdebug.addLayers(layers);
|
xpdebug.addLayers(layers);
|
||||||
xpdebug.setVisible(0,Infinity);
|
xpdebug.setVisible(0,Infinity);
|
||||||
xpdebug.show();
|
xpdebug.show();
|
||||||
|
|
|
||||||
|
|
@ -1436,7 +1436,7 @@
|
||||||
}, (layers, maxSpeed, minSpeed) => {
|
}, (layers, maxSpeed, minSpeed) => {
|
||||||
API.show.progress(0);
|
API.show.progress(0);
|
||||||
STACKS.clear();
|
STACKS.clear();
|
||||||
const stack = STACKS.create('parse', SPACE.platform.world);
|
const stack = STACKS.create('parse', SPACE.world);
|
||||||
layers.forEach(layer => stack.add(layer));
|
layers.forEach(layer => stack.add(layer));
|
||||||
updateSliderMax(true);
|
updateSliderMax(true);
|
||||||
updateSpeeds(maxSpeed, minSpeed);
|
updateSpeeds(maxSpeed, minSpeed);
|
||||||
|
|
@ -1513,7 +1513,7 @@
|
||||||
// mesh.castShadow = true;
|
// mesh.castShadow = true;
|
||||||
// mesh.receiveShadow = true;
|
// mesh.receiveShadow = true;
|
||||||
//
|
//
|
||||||
// SPACE.platform.world.add(mesh);
|
// SPACE.world.add(mesh);
|
||||||
let widget = newWidget().loadVertices(bigv)
|
let widget = newWidget().loadVertices(bigv)
|
||||||
widget.meta.file = opt.file;
|
widget.meta.file = opt.file;
|
||||||
platform.add(widget);
|
platform.add(widget);
|
||||||
|
|
|
||||||
|
|
@ -997,7 +997,8 @@
|
||||||
onMove: (f) => { platformOnMove = f },
|
onMove: (f) => { platformOnMove = f },
|
||||||
onHover: (f) => { platformHover = f },
|
onHover: (f) => { platformHover = f },
|
||||||
onClick: (f) => { platformClick = f},
|
onClick: (f) => { platformClick = f},
|
||||||
size: () => { return platform.scale }
|
size: () => { return platform.scale },
|
||||||
|
get world() { throw "platform.world deprecated" }
|
||||||
},
|
},
|
||||||
|
|
||||||
view: {
|
view: {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue