Skip to content

Attempt to support Extended Presence Flag #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
expiteRz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Attempt to support Extended Presence Flag #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
963ea32
Attempt to support Extended Presence Flag
Apr 1, 2023
3aaa4d9
Fix Object ID scanning
Apr 1, 2023
7eb813e
Merge branch 'master' into master
expiteRz Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/util/kmpData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,7 @@ class KmpData
this.objects.maxNodes = 0xffff
this.objects.onAddNode = (node) =>
{
node.padding = 0
node.pos = new Vec3(0, 0, 0)
node.rotation = new Vec3(0, 0, 0)
node.scale = new Vec3(1, 1, 1)
Expand Down
6 changes: 3 additions & 3 deletions src/viewer/viewerObjects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,13 +371,13 @@ class ViewerObjects extends PointViewer
panel.addText(selectionGroup, "<strong>GOBJ Index:</strong> " + i.toString() + " (0x" + i.toString(16) + ")")
}

let objName = panel.addText(selectionGroup, "<strong>Name:</strong> " + (selectedPoints.length > 0 ? objectNames[selectedPoints[0].id] : ""))
let objName = panel.addText(selectionGroup, "<strong>Name:</strong> " + (selectedPoints.length > 0 ? objectNames[selectedPoints[0].id&0x3ff] : ""))
panel.addSelectionNumericInput(selectionGroup, "ID", 0, 0xffff, selectedPoints.map(p => p.id), 1.0, 1.0, enabled, multiedit, (x, i) => {
this.window.setNotSaved()
selectedPoints[i].id = x
objName.innerHTML = "<strong>Name:</strong> " + objectNames[x]
objName.innerHTML = "<strong>Name:</strong> " + objectNames[(x&0x3ff)]
})

panel.addSelectionNumericInput(selectionGroup, "Padding", 0, 0xffff, selectedPoints.map(p => p.padding), 1.0, 1.0, enabled, multiedit, (x, i) => { this.window.setNotSaved(); selectedPoints[i].padding = x })
panel.addSelectionNumericInput(selectionGroup, "X", -1000000, 1000000, selectedPoints.map(p => p.pos.x), null, 100.0, enabled, multiedit, (x, i) => { this.window.setNotSaved(); selectedPoints[i].pos.x = x })
panel.addSelectionNumericInput(selectionGroup, "Y", -1000000, 1000000, selectedPoints.map(p => -p.pos.z), null, 100.0, enabled, multiedit, (x, i) => { this.window.setNotSaved(); selectedPoints[i].pos.z = -x })
panel.addSelectionNumericInput(selectionGroup, "Z", -1000000, 1000000, selectedPoints.map(p => -p.pos.y), null, 100.0, enabled, multiedit, (x, i) => { this.window.setNotSaved(); selectedPoints[i].pos.y = -x })
Expand Down