summaryrefslogtreecommitdiffstats
path: root/demos/viewport
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2015-11-21 13:31:25 +0100
committerRémi Verschelde <rverschelde@gmail.com>2015-12-09 08:39:12 +0100
commit8c4f19e79d3e8ac8bc8c283073dce5ccfbf222b5 (patch)
treec1124b6d4957389006024d1e1baa5de56e207fec /demos/viewport
parent8639cecf4cedd56452b47503be19c44b304cd02f (diff)
downloadredot-engine-8c4f19e79d3e8ac8bc8c283073dce5ccfbf222b5.tar.gz
Use upper-cased first letter at the start of comment sentences
Diffstat (limited to 'demos/viewport')
-rw-r--r--demos/viewport/2d_in_3d/pong.gd28
-rw-r--r--demos/viewport/gui_in_3d/gui_3d.gd16
-rw-r--r--demos/viewport/screen_capture/screen_capture.gd12
3 files changed, 28 insertions, 28 deletions
diff --git a/demos/viewport/2d_in_3d/pong.gd b/demos/viewport/2d_in_3d/pong.gd
index 113c1cd44e..bf93c63bf2 100644
--- a/demos/viewport/2d_in_3d/pong.gd
+++ b/demos/viewport/2d_in_3d/pong.gd
@@ -1,45 +1,45 @@
extends Node2D
-# member variables
+# Member variables
const INITIAL_BALL_SPEED = 80
var ball_speed = INITIAL_BALL_SPEED
-var screen_size = Vector2(640,400)
-# default ball direction
-var direction = Vector2(-1,0)
-var pad_size = Vector2(8,32)
+var screen_size = Vector2(640, 400)
+# Default ball direction
+var direction = Vector2(-1, 0)
+var pad_size = Vector2(8, 32)
const PAD_SPEED = 150
func _process(delta):
- # get ball position and pad rectangles
+ # Get ball position and pad rectangles
var ball_pos = get_node("ball").get_pos()
var left_rect = Rect2(get_node("left").get_pos() - pad_size*0.5, pad_size)
var right_rect = Rect2(get_node("right").get_pos() - pad_size*0.5, pad_size)
- # integrate new ball postion
+ # Integrate new ball postion
ball_pos += direction*ball_speed*delta
- # flip when touching roof or floor
+ # Flip when touching roof or floor
if ((ball_pos.y < 0 and direction.y < 0) or (ball_pos.y > screen_size.y and direction.y > 0)):
direction.y = -direction.y
- # flip, change direction and increase speed when touching pads
+ # Flip, change direction and increase speed when touching pads
if ((left_rect.has_point(ball_pos) and direction.x < 0) or (right_rect.has_point(ball_pos) and direction.x > 0)):
direction.x = -direction.x
ball_speed *= 1.1
direction.y = randf()*2.0 - 1
direction = direction.normalized()
- # check gameover
+ # Check gameover
if (ball_pos.x < 0 or ball_pos.x > screen_size.x):
ball_pos = screen_size*0.5
ball_speed = INITIAL_BALL_SPEED
- direction = Vector2(-1,0)
+ direction = Vector2(-1, 0)
get_node("ball").set_pos(ball_pos)
- # move left pad
+ # Move left pad
var left_pos = get_node("left").get_pos()
if (left_pos.y > 0 and Input.is_action_pressed("left_move_up")):
@@ -49,7 +49,7 @@ func _process(delta):
get_node("left").set_pos(left_pos)
- # move right pad
+ # Move right pad
var right_pos = get_node("right").get_pos()
if (right_pos.y > 0 and Input.is_action_pressed("right_move_up")):
@@ -62,6 +62,6 @@ func _process(delta):
func _ready():
# Initalization here
- screen_size = get_viewport_rect().size # get actual size
+ screen_size = get_viewport_rect().size # Get actual size
pad_size = get_node("left").get_texture().get_size()
set_process(true)
diff --git a/demos/viewport/gui_in_3d/gui_3d.gd b/demos/viewport/gui_in_3d/gui_3d.gd
index 8b9e352682..c640b133d3 100644
--- a/demos/viewport/gui_in_3d/gui_3d.gd
+++ b/demos/viewport/gui_in_3d/gui_3d.gd
@@ -1,26 +1,26 @@
extends Spatial
-# member variables
+# Member variables
var prev_pos = null
func _input(event):
- # all other (non-mouse) events
+ # All other (non-mouse) events
if (not event.type in [InputEvent.MOUSE_BUTTON, InputEvent.MOUSE_MOTION, InputEvent.SCREEN_DRAG, InputEvent.SCREEN_TOUCH]):
get_node("viewport").input(event)
-# mouse events for area
+# Mouse events for Area
func _on_area_input_event(camera, event, click_pos, click_normal, shape_idx):
- # use click pos (click in 3d space, convert to area space)
+ # Use click pos (click in 3d space, convert to area space)
var pos = get_node("area").get_global_transform().affine_inverse()*click_pos
- # convert to 2D
+ # Convert to 2D
pos = Vector2(pos.x, pos.y)
- # convert to viewport coordinate system
+ # Convert to viewport coordinate system
pos.x = (pos.x + 1.5)*100
pos.y = (-pos.y + 0.75)*100
- # set to event
+ # Set to event
event.pos = pos
event.global_pos = pos
if (prev_pos == null):
@@ -28,7 +28,7 @@ func _on_area_input_event(camera, event, click_pos, click_normal, shape_idx):
if (event.type == InputEvent.MOUSE_MOTION):
event.relative_pos = pos - prev_pos
prev_pos = pos
- # sned the event to the viewport
+ # Send the event to the viewport
get_node("viewport").input(event)
diff --git a/demos/viewport/screen_capture/screen_capture.gd b/demos/viewport/screen_capture/screen_capture.gd
index 393efb60b6..9867d95452 100644
--- a/demos/viewport/screen_capture/screen_capture.gd
+++ b/demos/viewport/screen_capture/screen_capture.gd
@@ -4,13 +4,13 @@ extends Control
func _on_button_pressed():
get_viewport().queue_screen_capture()
- # let two frames pass to make sure the screen was captured
- yield(get_tree(),"idle_frame")
- yield(get_tree(),"idle_frame")
- # retrieve the captured image
+ # Let two frames pass to make sure the screen was captured
+ yield(get_tree(), "idle_frame")
+ yield(get_tree(), "idle_frame")
+ # Retrieve the captured image
var img = get_viewport().get_screen_capture()
- # create a texture for it
+ # Create a texture for it
var tex = ImageTexture.new()
tex.create_from_image(img)
- # set it to the capture node
+ # Set it to the capture node
get_node("capture").set_texture(tex)