mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-01-30 15:42:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Vertex snap support for group pivots

Browse Source
This commit is contained in:
JannisX11 2022-08-11 19:07:52 +02:00
parent ebda6d4671
commit b8663462e1
3 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/outliner/mesh.js
View File

@ -751,6 +751,7 @@ new NodePreviewController(Mesh, {
// Vertex Points
let points = new THREE.Points(new THREE.BufferGeometry(), Canvas.meshVertexMaterial);
points.element_uuid = element.uuid;
points.geometry.setAttribute('color', new THREE.Float32BufferAttribute(new Array(24).fill(1), 3));
mesh.vertex_points = points;
outline.add(points);

15
js/preview/preview.js
View File

@ -386,12 +386,8 @@ class Preview {
}
}
})
if (Vertexsnap.vertex_gizmos.children.length) {
Vertexsnap.vertex_gizmos.children.forEach(function(s) {
if (s.isVertex === true) {
objects.push(s)
}
})
if (Group.selected && Group.selected.mesh.vertex_points) {
objects.push(Group.selected.mesh.vertex_points);
}
if (Animator.open && settings.motion_trails.value && Group.selected) {
Animator.motion_trail.children.forEach(object => {
@ -443,7 +439,7 @@ class Preview {
keyframe: keyframe
}
} else if (intersect_object.type == 'Points') {
var element = OutlinerNode.uuids[intersect_object.parent.parent.name];
var element = OutlinerNode.uuids[intersect_object.element_uuid];
let vertex = element instanceof Mesh
? Object.keys(element.vertices)[intersect.index]
: intersect_object.vertices[intersect.index];
@ -1914,16 +1910,11 @@ function initCanvas() {
display_base.name = 'display_base'
display_area.name = 'display_area'
scene.add(Vertexsnap.vertex_gizmos)
Vertexsnap.vertex_gizmos.name = 'vertex_handles'
Canvas.gizmos.push(Vertexsnap.vertex_gizmos)
Canvas.outlines = new THREE.Object3D();
Canvas.outlines.name = 'outline_group'
scene.add(Canvas.outlines)
Canvas.gizmos.push(Canvas.outlines)
canvas_scenes = {
monitor: new PreviewBackground({name: 'display.reference.monitor' }),
inventory_nine: new PreviewBackground({name: 'display.reference.inventory_nine', image: './assets/inventory_nine.png', x: 0, y: -525, size: 1051, lock: true}),

60
js/transform.js
View File

@ -230,7 +230,6 @@ function mirrorSelected(axis) {
const Vertexsnap = {
step1: true,
vertex_gizmos: new THREE.Object3D(),
line: new THREE.Line(new THREE.BufferGeometry(), Canvas.outlineMaterial),
elements_with_vertex_gizmos: [],
hovering: false,
@ -245,16 +244,19 @@ const Vertexsnap = {
if (!mesh.vertex_points) {
mesh.updateMatrixWorld()
let vectors = [];
let positions = mesh.geometry.attributes.position.array;
for (let i = 0; i < positions.length; i += 3) {
let vec = [positions[i], positions[i+1], positions[i+2]];
if (!vectors.find(vec2 => vec.equals(vec2))) {
vectors.push(vec);
if (mesh.geometry) {
let positions = mesh.geometry.attributes.position.array;
for (let i = 0; i < positions.length; i += 3) {
let vec = [positions[i], positions[i+1], positions[i+2]];
if (!vectors.find(vec2 => vec.equals(vec2))) {
vectors.push(vec);
}
}
}
vectors.push([0, 0, 0]);
let points = new THREE.Points(new THREE.BufferGeometry(), new THREE.PointsMaterial().copy(Canvas.meshVertexMaterial));
points.element_uuid = element.uuid;
points.vertices = vectors;
let vector_positions = [];
vectors.forEach(vector => vector_positions.push(...vector));
@ -264,7 +266,11 @@ const Vertexsnap = {
points.geometry.setAttribute('color', new THREE.Float32BufferAttribute(new Float32Array(vector_colors), 3));
points.material.transparent = true;
mesh.vertex_points = points;
mesh.outline.add(points);
if (mesh.outline) {
mesh.outline.add(points);
} else {
mesh.add(points);
}
}
mesh.vertex_points.visible = true;
mesh.vertex_points.renderOrder = 900;
@ -334,6 +340,9 @@ const Vertexsnap = {
Outliner.selected.forEach(function(element) {
Vertexsnap.addVertices(element)
})
if (Group.selected) {
Vertexsnap.addVertices(Group.selected)
}
if (Outliner.selected.length) {
$('#preview').css('cursor', (Vertexsnap.step1 ? 'copy' : 'alias'))
}
@ -347,6 +356,7 @@ const Vertexsnap = {
Vertexsnap.vertex_index = data.vertex_index;
Vertexsnap.move_origin = typeof data.vertex !== 'string' && data.vertex.allEqual(0);
Vertexsnap.elements = Outliner.selected.slice();
Vertexsnap.group = Group.selected;
Vertexsnap.selected_vertices = JSON.parse(JSON.stringify(Project.selected_vertices));
Vertexsnap.clearVertexGizmos()
$('#preview').css('cursor', (Vertexsnap.step1 ? 'copy' : 'alias'))
@ -364,22 +374,33 @@ const Vertexsnap = {
return vector;
},
snap: function(data) {
Undo.initEdit({elements: Vertexsnap.elements})
Undo.initEdit({elements: Vertexsnap.elements, outliner: !!Vertexsnap.group});
let mode = BarItems.vertex_snap_mode.get()
let mode = BarItems.vertex_snap_mode.get();
if (Vertexsnap.move_origin) {
Vertexsnap.elements.forEach(function(element) {
if (Vertexsnap.group) {
let vec = Vertexsnap.getGlobalVertexPos(data.element, data.vertex);
if (Format.bone_rig && element.parent instanceof Group && element.mesh.parent) {
element.mesh.parent.worldToLocal(vec);
if (Format.bone_rig && Vertexsnap.group.parent instanceof Group && Vertexsnap.group.mesh.parent) {
Vertexsnap.group.mesh.parent.worldToLocal(vec);
}
let vec_array = vec.toArray()
vec_array.V3_add(element.parent.origin);
element.transferOrigin(vec_array)
})
vec_array.V3_add(Vertexsnap.group.parent.origin);
Vertexsnap.group.transferOrigin(vec_array)
} else {
Vertexsnap.elements.forEach(function(element) {
let vec = Vertexsnap.getGlobalVertexPos(data.element, data.vertex);
if (Format.bone_rig && element.parent instanceof Group && element.mesh.parent) {
element.mesh.parent.worldToLocal(vec);
}
let vec_array = vec.toArray()
vec_array.V3_add(element.parent.origin);
element.transferOrigin(vec_array)
})
}
} else {
var global_delta = Vertexsnap.getGlobalVertexPos(data.element, data.vertex);
@ -448,7 +469,12 @@ const Vertexsnap = {
}
Vertexsnap.clearVertexGizmos()
Canvas.updateAllPositions()
Canvas.updateView({
elements: Vertexsnap.elements,
element_aspects: {transform: true, geometry: true},
groups: Vertexsnap.group ? [Vertexsnap.group] : undefined,
group_aspects: {transform: true}
})
Undo.finishEdit('Use vertex snap')
Vertexsnap.step1 = true
}