Skip to content

Commit

Permalink
Merge pull request #3 from disketflu/master
Browse files Browse the repository at this point in the history
Added more padding spaces in 2 python files
  • Loading branch information
astrofra authored Nov 15, 2021
2 parents fa3b639 + 1c099af commit eb23a70
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions app/OrbitalCam.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ def OrbitalController(keyboard, mouse, cam_pos, cam_rot, cam_tgt, dt, width, hei

# clamp X

if cam_rot.x > pi/2:
cam_rot.x = pi/2
if cam_rot.x > pi / 2:
cam_rot.x = pi / 2
if cam_rot.x < 0:
cam_rot.x = 0

Expand Down
8 changes: 4 additions & 4 deletions app/poppy_api_rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,11 @@ def get_v_from_dancing(id_robot):
m_world_scale = hg.GetS(m_world)

if hg_m["offset_slider"].x == 1:
m_pos += hg.GetX(m_world)*0.03
m_pos += hg.GetX(m_world) * 0.03
if hg_m["offset_slider"].y == 1:
m_pos += hg.GetZ(m_world)*-0.015
m_pos += hg.GetZ(m_world) * -0.015
if hg_m["offset_slider"].z == 1:
m_pos += hg.GetY(m_world)*0.003
m_pos += hg.GetY(m_world) * 0.003

# draw jauge in axis
m_world = hg.TransformationMat4(m_pos, m_world_rot, m_world_scale) * hg.RotationMat4(hg_m["offset_rotation"])
Expand Down Expand Up @@ -323,7 +323,7 @@ def get_v_from_dancing(id_robot):

# texture quad
quad_width = quad_height = res_y * 0.12
pos_in_pixel = hg.iVec2(int(res_x - quad_width*1.1), int((res_y*0.05) + (res_y*0.9)/len(hg_motors) * id + (quad_height*1.2)/2))
pos_in_pixel = hg.iVec2(int(res_x - quad_width * 1.1), int((res_y * 0.05) + (res_y * 0.9)/len(hg_motors) * id + (quad_height * 1.2) / 2))

#setup quad vertices
mat = hg.TransformationMat4(hg.Vec3(pos_in_pixel.x, pos_in_pixel.y, 1), hg.Vec3(0, 0, 0), hg.Vec3(1, 1, 1))
Expand Down

0 comments on commit eb23a70

Please sign in to comment.