godotengine/godot-demo-projects
1
0
Fork 0
mirror of https://github.com/godotengine/godot-demo-projects.git synced 2026-01-06 14:10:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #223 from cbscribe/code_cleanup

Browse Source 
Code cleanup
This commit is contained in:
Nathan Lovato
2018-03-31 06:52:23 +09:00
committed by GitHub
parent 7f969fca7a 9d66e8f2ef
commit ff4da36c17
31 changed files with 319 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
3d/material_testers/tester.gd
View File

@@ -27,26 +27,24 @@ func _ready():
func _unhandled_input(ev):
if (ev is InputEventMouseButton and ev.button_index == BUTTON_WHEEL_UP):
if (zoom<ZOOM_MAX):
zoom+=ZOOM_SPEED
if ev is InputEventMouseButton and ev.button_index == BUTTON_WHEEL_UP:
if zoom < ZOOM_MAX:
zoom += ZOOM_SPEED
get_node("camera/base/rotation/camera").translation.z = -zoom
if (ev is InputEventMouseButton and ev.button_index == BUTTON_WHEEL_DOWN):
if (zoom>0):
zoom-=ZOOM_SPEED
if ev is InputEventMouseButton and ev.button_index == BUTTON_WHEEL_DOWN:
if zoom > 0:
zoom -= ZOOM_SPEED
get_node("camera/base/rotation/camera").translation.z = -zoom
if (ev is InputEventMouseMotion and ev.button_mask & BUTTON_MASK_LEFT):
if ev is InputEventMouseMotion and ev.button_mask & BUTTON_MASK_LEFT:
rot_y += ev.relative.x * ROT_SPEED
rot_x += ev.relative.y * ROT_SPEED
rot_y = clamp(rot_y,-180,180)
rot_x = clamp(rot_x,0,150)
rot_y = clamp(rot_y, -180, 180)
rot_x = clamp(rot_x, 0, 150)
var t = Transform()
t = t.rotated(Vector3(0,0,1),rot_x * PI / 180.0)
t = t.rotated(Vector3(0,1,0),-rot_y * PI / 180.0)
t = t.rotated(Vector3(0, 0, 1), rot_x * PI / 180.0)
t = t.rotated(Vector3(0, 1, 0), -rot_y * PI / 180.0)
get_node("camera/base").transform.basis = t.basis
@@ -58,27 +56,24 @@ func _process(delta):
var from_p = from_xform.origin
var from_r = Quat(from_xform.basis)
p = from_p.linear_interpolate(p,INTERP_SPEED*delta)
r = from_r.slerp(r,INTERP_SPEED*delta)
p = from_p.linear_interpolate(p, INTERP_SPEED * delta)
r = from_r.slerp(r, INTERP_SPEED * delta)
var m = Transform(r)
m.origin=p
m.origin = p
get_node("camera").transform=m
get_node("camera").transform = m
get_node("ui/label").text = get_node("testers").get_child(tester_index).get_name()
func _on_prev_pressed():
if (tester_index > 0):
tester_index-=1
pass # replace with function body
if tester_index > 0:
tester_index -= 1
func _on_next_pressed():
if (tester_index < get_node("testers").get_child_count() -1):
tester_index+=1
if tester_index < get_node("testers").get_child_count() -1:
tester_index += 1
func _on_bg_item_selected( ID ):