Skip to content

editor: Add local space movement #720

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
q8X wants to merge 1 commit into
base: master
Choose a base branch
from
Open

editor: Add local space movement #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 [editor]/editor_main/client/controls.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ local defaultControls = {
{ name="mod_rotate", key ="lctrl", friendlyName="Rotate Modifier World Space" },
{ name="mod_rotate_local", key ="rctrl", friendlyName="Rotate Modifier Local Space" },
{ name="high_sensitivity_mode", key ="e", friendlyName="High Sensivity Mode" },
{ name="local_move_space_mode", key ="v", friendlyName="Local Move Space Mode" },
{ name="element_move_right", key ="arrow_r", friendlyName="Move Element Right / Yaw" },
{ name="element_move_left", key ="arrow_l", friendlyName="Move Element Left / Yaw" },
{ name="element_move_forward", key ="arrow_u", friendlyName="Move Element Forward / Pitch" },
Expand Down
6 changes: 6 additions & 0 deletions [editor]/editor_main/client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,6 +1171,7 @@ function bindInput(commandsOnly)
bindControl("redo", "down", keyboardRedo)
bindControl("high_sensitivity_mode", "down", toggleSensitivityMode)
bindControl("lock_selected_element", "down", lockSelectedElement)
bindControl("local_move_space_mode", "down", toggleLocalMoveSpaceMode)
end

function unbindInput(commandsOnly)
Expand All @@ -1192,6 +1193,7 @@ function unbindInput(commandsOnly)
unbindControl("redo", "down", keyboardRedo)
unbindControl("high_sensitivity_mode", "down", toggleSensitivityMode)
unbindControl("lock_selected_element", "down", lockSelectedElement)
unbindControl("local_move_space_mode", "down", toggleLocalMoveSpaceMode)
end

-- get the point and element targeted by the camera
Expand Down Expand Up @@ -1329,6 +1331,10 @@ function toggleSensitivityMode ()
end
end

function toggleLocalMoveSpaceMode()
exports.move_keyboard:toggleLocalMoveSpace()
end

function streamInCollessObjects()
if getElementType(source) == "object" then
g_colless[source] = true
Expand Down
3 changes: 3 additions & 0 deletions [editor]/move_keyboard/meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@
<export function="toggleAxesLock" type="client" />
<export function="enable" type="client" />
<export function="disable" type="client" />

<export function="toggleLocalMoveSpace" type="client" />
<export function="isLocalMoveSpace" type="client" />
</meta>
104 changes: 69 additions & 35 deletions [editor]/move_keyboard/move_keyboard.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ local MOVEMENT_MOVE = 1
local MOVEMENT_ROTATE_WORLD = 2
local MOVEMENT_ROTATE_LOCAL = 3

local localMoveSpace = false

local hasRotation = {
object = true,
player = true,
Expand All @@ -33,6 +35,14 @@ local hasRotation = {

-- PRIVATE

local function getPositionFromElementOffset(element,offX,offY,offZ)
local m = getElementMatrix ( element )
local x = offX * m[1][1] + offY * m[2][1] + offZ * m[3][1] + m[4][1]
local y = offX * m[1][2] + offY * m[2][2] + offZ * m[3][2] + m[4][2]
local z = offX * m[1][3] + offY * m[2][3] + offZ * m[3][3] + m[4][3]
return x, y, z
end

local function getCameraRotation ()
local px, py, pz, lx, ly, lz = getCameraMatrix()
local rotz = 6.2831853071796 - math.atan2 ( ( lx - px ), ( ly - py ) ) % 6.2831853071796
Expand Down Expand Up @@ -110,38 +120,53 @@ local function onClientRender_keyboard()
speed = moveSpeed.medium
end

-- convert getCameraRotation output to radians
camRotZ = math.rad(camRotZ)
local distanceX = speed * math.cos(camRotZ)
local distanceY = speed * math.sin(camRotZ)
if not localMoveSpace then
-- convert getCameraRotation output to radians
camRotZ = math.rad(camRotZ)
local distanceX = speed * math.cos(camRotZ)
local distanceY = speed * math.sin(camRotZ)

-- right/left
if (getCommandState("element_move_right")) then
tempX = tempX + distanceX
tempY = tempY - distanceY
end
if (getCommandState("element_move_left")) then
tempX = tempX - distanceX
tempY = tempY + distanceY
end
-- right/left
if (getCommandState("element_move_right")) then
tempX = tempX + distanceX
tempY = tempY - distanceY
end
if (getCommandState("element_move_left")) then
tempX = tempX - distanceX
tempY = tempY + distanceY
end

-- forward/back
if (getCommandState("element_move_forward")) then
tempX = tempX + distanceY
tempY = tempY + distanceX
end
-- forward/back
if (getCommandState("element_move_forward")) then
tempX = tempX + distanceY
tempY = tempY + distanceX
end

if (getCommandState("element_move_backward")) then
tempX = tempX - distanceY
tempY = tempY - distanceX
end
if (getCommandState("element_move_backward")) then
tempX = tempX - distanceY
tempY = tempY - distanceX
end

-- up/down
if (getCommandState("element_move_upwards")) then
tempZ = tempZ + speed
end
if (getCommandState("element_move_downwards")) then
tempZ = tempZ - speed
-- up/down
if (getCommandState("element_move_upwards")) then
tempZ = tempZ + speed
end
if (getCommandState("element_move_downwards")) then
tempZ = tempZ - speed
end
else
-- local space
local x, y, z = 0, 0, 0
if getCommandState("element_move_right") then x = x + speed end
if getCommandState("element_move_left") then x = x - speed end
if getCommandState("element_move_forward") then y = y + speed end
if getCommandState("element_move_backward") then y = y - speed end
if getCommandState("element_move_upwards") then z = z + speed end
if getCommandState("element_move_downwards") then z = z - speed end

if x ~= 0 or y ~= 0 or z ~= 0 then
tempX, tempY, tempZ = getPositionFromElementOffset(selectedElement, x, y, z)
end
end

-- check if position changed
Expand Down Expand Up @@ -192,9 +217,9 @@ local function onClientRender_keyboard()
else
local tempRotX, tempRotY, tempRotZ = rotX, rotY, rotZ
if (not tempRotX) then return false end

local yaw, pitch, roll = 0, 0, 0

-- yaw
if (getCommandTogSTATE("element_move_right")) then
yaw = speed
Expand All @@ -208,14 +233,14 @@ local function onClientRender_keyboard()
elseif (getCommandTogSTATE("element_move_downwards")) then
pitch = -speed
end

-- roll
if (getCommandTogSTATE("element_move_forward")) then
roll = speed
elseif (getCommandTogSTATE("element_move_backward")) then
roll = -speed
end

-- Perform rotation about one axis at a time
if yaw ~= 0 then
tempRotX, tempRotY, tempRotZ = exports.editor_main:applyIncrementalRotation(selectedElement, "yaw", yaw, world_space)
Expand Down Expand Up @@ -289,7 +314,7 @@ local function onClientRender_keyboard()
if (not tempRotX) then return false end

local yaw, pitch, roll = 0, 0, 0

-- yaw
if (getCommandTogSTATE("element_move_right")) then
yaw = speed
Expand All @@ -303,14 +328,14 @@ local function onClientRender_keyboard()
elseif (getCommandTogSTATE("element_move_downwards")) then
pitch = -speed
end

-- roll
if (getCommandTogSTATE("element_move_forward")) then
roll = speed
elseif (getCommandTogSTATE("element_move_backward")) then
roll = -speed
end

-- Perform rotation about one axis at a time
if yaw ~= 0 then
tempRotX, tempRotY, tempRotZ = exports.editor_main:applyIncrementalRotation(selectedElement, "yaw", yaw, world_space)
Expand Down Expand Up @@ -538,6 +563,15 @@ function toggleAxesLock ( bool )
return true
end

function toggleLocalMoveSpace()
localMoveSpace = not localMoveSpace
exports.editor_gui:outputMessage("Local Move Space Mode "..(localMoveSpace and "Enabled" or "Disabled"), 50, 255, 50)
end

function isLocalMoveSpace()
return localMoveSpace
end

function enable()
if isEnabled then
return false
Expand Down