Skip to content

Removed redundant code #2

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
initramfs wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Removed redundant code #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3100493
Added bottom-aligned speedometer
initramfs Jan 25, 2014
b66e972
Synced branch with upstream
initramfs Jan 26, 2014
25d9721
Removed redundant code
initramfs Jan 26, 2014
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
14 changes: 3 additions & 11 deletions client/speedometer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,16 +175,8 @@ function Speedometer:Render()
local angle = vehicle:GetAngle() * Angle( math.pi, 0, math.pi )

local factor = math.clamp( vehicle:GetHealth() - 0.4, 0.0, 0.6 ) * 2.5

local textcol
local col = math.lerp( self.zero_health, self.full_health, factor )

if self.isBoosting then
textcol = Color(127, 195, 227)
else
textcol = col
end


if self.bottom_aligned then
local text_size = speed_size + Vector2( unit_size.x + 16, 0 )

Expand All @@ -198,7 +190,7 @@ function Speedometer:Render()
unit_position.x = speed_position.x + speed_size.x + 16
unit_position.y = speed_position.y + ((speed_size.y - unit_size.y) / 2)

self:DrawShadowedText2( speed_position, speed_text, textcol, self.speed_text_size )
self:DrawShadowedText2( speed_position, speed_text, col, self.speed_text_size )
self:DrawShadowedText2( unit_position,
unit_text,
Color( 255, 255, 255, 255 ),
Expand Down Expand Up @@ -244,7 +236,7 @@ function Speedometer:Render()

Render:SetTransform( t )

self:DrawShadowedText3( Vector3( 0, 0, 0 ), speed_text, textcol, self.speed_text_size )
self:DrawShadowedText3( Vector3( 0, 0, 0 ), speed_text, col, self.speed_text_size )
self:DrawShadowedText3( Vector3( speed_size.x + 24, (speed_size.y - unit_size.y)/2, 0),
unit_text,
Color( 255, 255, 255, 255 ),
Expand Down