Skip to content
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

Jump to bottom

Reworked new X-O-Meter model #77

Merged
merged 4 commits into from
Aug 30, 2023
Merged

Reworked new X-O-Meter model #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b04be5d
New X-O-Meter model
QuestionableM Aug 29, 2023
e1016a2
Reverted some changes to animation code
QuestionableM Aug 29, 2023
0866447
Updated speed meter textures
IlluminaGal Aug 29, 2023
cc85483
speed meter color tweak
IlluminaGal Aug 29, 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
Binary file modified Objects/Mesh/MeshNew/obj_interactive_speedmeter.fbx
View file
Open in desktop
Binary file not shown.
Binary file modified Objects/Textures/TexturesNew/obj_interactive_speedmeter_asg.tga
View file
Open in desktop
Binary file not shown.
Binary file modified Objects/Textures/TexturesNew/obj_interactive_speedmeter_dif.tga
View file
Open in desktop
Binary file not shown.
Binary file modified Objects/Textures/TexturesNew/obj_interactive_speedmeter_nor.tga
View file
Open in desktop
Binary file not shown.
13 changes: 6 additions & 7 deletions Scripts/interactable/Orientation/XOMeter.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,22 +400,21 @@ function XOMeter.client_onFixedUpdate(self, dt)


elseif mode.savevalue == 7 then -- velocity
one = ((sInteractable.power / 4 + 152) / 310) % 1.0
one = ((sInteractable.power / 4 + 67) / 134) % 1.0
elseif mode.savevalue == 8 then --rpm
one = ((sInteractable.power + 152) / 310) % 1.0
one = ((sInteractable.power + 67) / 134) % 1.0
elseif mode.savevalue == 10 then --mass
one = ((sInteractable.power / 10 + 102) / 310) % 1.0
one = ((sInteractable.power / 10 + 7) / 134) % 1.0
elseif mode.savevalue == 11 then -- orient
local value = 0.5 - sInteractable.power / 360

local value = 0.5+sInteractable.power/360

if self.shape:getZAxis().z < 0 then
value = 0.5+sInteractable.power/360
value = 0.5 + sInteractable.power / 360
end

one = value % 1.0
else
one = ((sInteractable.power + 102) / 310) % 1.0 -- garbage
one = ((sInteractable.power + 17) / 134) % 1.0 -- garbage
end

self.interactable:setAnimProgress("arrow_anim", one)
Expand Down