mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-02-17 16:20:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make preview scenes compatible with first person display mode

Browse Source
This commit is contained in:
JannisX11 2024-09-28 16:46:57 +02:00
parent a596ee2106
commit b84704074b
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/display_mode.js
View File

@ -323,7 +323,7 @@ class refModel {
case 'monitor':
this.updateBasePosition = function() {
var side = display_slot.includes('left') ? -1 : 1;
setDisplayArea(side*9.039, -8.318, 20.8, 0, 0, 0, 1,1,1)
setDisplayArea(side*9.039, -8.318+24, 20.8, 0, 0, 0, 1,1,1)
}
break;
case 'frame':
@ -349,13 +349,13 @@ class refModel {
case 'bow':
this.updateBasePosition = function() {
var side = display_slot.includes('left') ? -1 : 1;
setDisplayArea(side*4.2, -4.9, 25, -20, -19, -8, 1,1,1)
setDisplayArea(side*4.2, -4.9+24, 25, -20, -19, -8, 1,1,1)
}
break;
case 'crossbow':
this.updateBasePosition = function() {
var side = display_slot.includes('left') ? -1 : 1;
setDisplayArea(side*-1.2, -6.75, 23, 0, side*10, 0, 1, 1, 1)
setDisplayArea(side*-1.2, -6.75+24, 23, 0, side*10, 0, 1, 1, 1)
}
break;
@ -363,7 +363,7 @@ class refModel {
this.updateBasePosition = function() {
var side = display_slot.includes('left') ? -1 : 1;
DisplayMode.setBase(
side*-1.7, -6.1, 23.4,
side*-1.7, -6.1+24, 23.4,
-92, side*100, side*119,
0.8, 0.8, 0.8)
}
@ -1155,10 +1155,10 @@ class refModel {
}
buildMonitor() {
this.buildModel(JSON.parse(`[
{"size": [8, 8, 0.1], "pos": [0, 4.93, 31.20], "origin": [0, 0, 0], "north":{"uv":[0,0,0,0]},"east":{"uv":[0,0,0,0]},"south":{"uv":[0,0,0,0]},"west":{"uv":[0,0,16,16]},"up":{"uv":[0,0,0,0]},"down":{"uv":[0,0,0,0]}},
{"size": [8, 8, 0.1], "pos": [0, -4.93, 31.20], "origin": [0, 0, 0], "north":{"uv":[0,0,0,0]},"east":{"uv":[0,0,0,0]},"south":{"uv":[0,0,0,0]},"west":{"uv":[0,0,16,16]},"up":{"uv":[0,0,0,0]},"down":{"uv":[0,0,0,0]}},
{"size": [8, 8, 0.1], "pos": [5.65, 0, 31.2], "origin": [0, 0, 0], "north":{"uv":[0,0,0,0]},"east":{"uv":[0,0,0,0]},"south":{"uv":[0,0,0,0]},"west":{"uv":[0,0,16,16]},"up":{"uv":[0,0,0,0]},"down":{"uv":[0,0,0,0]}},
{"size": [8, 8, 0.1], "pos": [-5.65, 0, 31.2], "origin": [0, 0, 0], "north":{"uv":[0,0,0,0]},"east":{"uv":[0,0,0,0]},"south":{"uv":[0,0,0,0]},"west":{"uv":[0,0,16,16]},"up":{"uv":[0,0,0,0]},"down":{"uv":[0,0,0,0]}}
{"size": [8, 8, 0.1], "pos": [0, 28.93, 31.20], "origin": [0, 0, 0], "north":{"uv":[0,0,0,0]},"east":{"uv":[0,0,0,0]},"south":{"uv":[0,0,0,0]},"west":{"uv":[0,0,16,16]},"up":{"uv":[0,0,0,0]},"down":{"uv":[0,0,0,0]}},
{"size": [8, 8, 0.1], "pos": [0, 19.07, 31.20], "origin": [0, 0, 0], "north":{"uv":[0,0,0,0]},"east":{"uv":[0,0,0,0]},"south":{"uv":[0,0,0,0]},"west":{"uv":[0,0,16,16]},"up":{"uv":[0,0,0,0]},"down":{"uv":[0,0,0,0]}},
{"size": [8, 8, 0.1], "pos": [5.65, 24, 31.2], "origin": [0, 0, 0], "north":{"uv":[0,0,0,0]},"east":{"uv":[0,0,0,0]},"south":{"uv":[0,0,0,0]},"west":{"uv":[0,0,16,16]},"up":{"uv":[0,0,0,0]},"down":{"uv":[0,0,0,0]}},
{"size": [8, 8, 0.1], "pos": [-5.65, 24, 31.2], "origin": [0, 0, 0], "north":{"uv":[0,0,0,0]},"east":{"uv":[0,0,0,0]},"south":{"uv":[0,0,0,0]},"west":{"uv":[0,0,16,16]},"up":{"uv":[0,0,0,0]},"down":{"uv":[0,0,0,0]}}
]`), 'black')
}
buildBlock() {
@ -1530,8 +1530,8 @@ function getOptimalFocalLength() {
DisplayMode.loadFirstRight = function() { //Loader
loadDisp('firstperson_righthand')
display_preview.loadAnglePreset({
position: [0, 0, 32.4],
target: [0, 0, 0],
position: [0, 24, 32.4],
target: [0, 24, 0],
focal_length: getOptimalFocalLength(),
})
display_preview.controls.enabled = false
@ -1542,8 +1542,8 @@ DisplayMode.loadFirstRight = function() { //Loader
DisplayMode.loadFirstLeft = function() { //Loader
loadDisp('firstperson_lefthand')
display_preview.loadAnglePreset({
position: [0, 0, 32.4],
target: [0, 0, 0],
position: [0, 24, 32.4],
target: [0, 24, 0],
focal_length: getOptimalFocalLength(),
})
display_preview.controls.enabled = false

4
js/preview/preview_scenes.js
View File

@ -106,7 +106,7 @@ class PreviewScene {
Canvas.global_light_side = this.light_side;
scene.background = this.cubemap;
scene.fog = this.fog;
if (this.fov) {
if (this.fov && !(Modes.display && display_slot.startsWith('firstperson'))) {
Preview.selected.setFOV(this.fov);
}
// Update independent models
@ -129,7 +129,7 @@ class PreviewScene {
Canvas.global_light_side = 0;
if (this.cubemap) scene.background = null;
if (this.fog) scene.fog = null;
if (this.fov) {
if (this.fov && !(Modes.display && display_slot.startsWith('firstperson'))) {
Preview.all.forEach(preview => preview.setFOV(settings.fov.value));
}
Blockbench.dispatchEvent('unselect_preview_scene', {scene: this});