rubenwardy
/
The-NodeBox-Generator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pixel snapping during shift

master
rubenwardy 2015-07-26 14:34:13 +01:00
parent a1639e9f7d
commit 857b3a8b31
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/modes/NBEditor.cpp
View File

@ -367,12 +367,6 @@ void CDR::update(NBEditor* editor, bool drag, rect<s32> offset)
(f32)node->position.Z
);
if (editor->state->settings->getBool("snapping")) {
wpos.X = (f32)floor((wpos.X + 0.5) * 16 + 0.5) / 16 - 0.5;
wpos.Y = (f32)floor((wpos.Y + 0.5) * 16 + 0.5) / 16 - 0.5;
wpos.Z = (f32)floor((wpos.Z + 0.5) * 16 + 0.5) / 16 - 0.5;
}
// Do node limiting
if (editor->state->settings->getBool("limiting")) {
// X Axis
@ -400,10 +394,23 @@ void CDR::update(NBEditor* editor, bool drag, rect<s32> offset)
// Call required function
editor->fillProperties();
if (actualType < CDR_XZ) {
if (editor->state->settings->getBool("snapping")) {
wpos.X = (f32)floor((wpos.X + 0.5) * 16 + 0.5) / 16 - 0.5;
wpos.Y = (f32)floor((wpos.Y + 0.5) * 16 + 0.5) / 16 - 0.5;
wpos.Z = (f32)floor((wpos.Z + 0.5) * 16 + 0.5) / 16 - 0.5;
// (X + 0.5) round relative to (-0.5, -0.5, -0.5)
// ie: (-0.5, -0.5, -0.5) goes to (0, 0, 0)
// * 16 round to the nearest 16th
// + 0.5 do rounding, rather than flooring
// / 16 - 0.5 go back to normal coordinates
}
box->moveFace(editor->state, actualType, wpos,
editor->state->keys[KEY_LCONTROL] == EKS_DOWN);
} else {
box->move(editor->state, actualType, wpos);
box->move(editor->state, actualType, wpos,
editor->state->settings->getBool("snapping"));
}
node->remesh(box);

12
src/project/nodebox.cpp
View File

@ -90,7 +90,8 @@ void NodeBox::moveFace(EditorState* editor, ECDR_DIR type,
rebuild_needed = true;
}
void NodeBox::move(EditorState* editor, ECDR_DIR type, vector3df position)
void NodeBox::move(EditorState* editor, ECDR_DIR type, vector3df position,
bool do_snap)
{
vector3df new_one = one;
vector3df new_two = two;
@ -156,6 +157,15 @@ void NodeBox::move(EditorState* editor, ECDR_DIR type, vector3df position)
}
}
if (do_snap) {
vector3df snapped_one(
(f32)floor((new_one.X + 0.5) * 16 + 0.5) / 16 - 0.5,
(f32)floor((new_one.Y + 0.5) * 16 + 0.5) / 16 - 0.5,
(f32)floor((new_one.Z + 0.5) * 16 + 0.5) / 16 - 0.5);
new_two += snapped_one - new_one;
new_one = snapped_one;
}
one = new_one;
two = new_two;

3
src/project/nodebox.hpp
View File

@ -45,7 +45,8 @@ public:
// Transformations
void moveFace(EditorState* editor, ECDR_DIR type,
vector3df position, bool both);
void move(EditorState* editor, ECDR_DIR type, vector3df position);
void move(EditorState* editor, ECDR_DIR type, vector3df position,
bool do_snap=false);
void rotate(EAxis axis);
void flip(EAxis axis);