From bf79221919dbcd77bdd9cd3ff84cecab7cbd0fad Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Wed, 5 Nov 2014 21:20:42 -0300
Subject: [PATCH] SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=-

*YOUR SOURCE MIGHT NOT WORK*
For mor information on fix:
https://github.com/okamstudio/godot/wiki/devel_scene_tree

Other stuff:
-Shower of bullets demo
-Fixes all around
---
 2d/shower_of_bullets/bullet.png     | Bin 0 -> 477 bytes
 2d/shower_of_bullets/bullets.gd     |  76 ++++++++++++++++++++++++++++
 2d/shower_of_bullets/engine.cfg     |  16 ++++++
 2d/shower_of_bullets/face_happy.png | Bin 0 -> 1243 bytes
 2d/shower_of_bullets/face_sad.png   | Bin 0 -> 1240 bytes
 2d/shower_of_bullets/icon.png       | Bin 0 -> 2777 bytes
 2d/shower_of_bullets/shower.gd      |  32 ++++++++++++
 2d/shower_of_bullets/shower.scn     | Bin 0 -> 1836 bytes
 misc/autoload/global.gd             |   4 +-
 misc/pause/spinpause.gd             |   4 +-
 10 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 2d/shower_of_bullets/bullet.png
 create mode 100644 2d/shower_of_bullets/bullets.gd
 create mode 100644 2d/shower_of_bullets/engine.cfg
 create mode 100644 2d/shower_of_bullets/face_happy.png
 create mode 100644 2d/shower_of_bullets/face_sad.png
 create mode 100644 2d/shower_of_bullets/icon.png
 create mode 100644 2d/shower_of_bullets/shower.gd
 create mode 100644 2d/shower_of_bullets/shower.scn

diff --git a/2d/shower_of_bullets/bullet.png b/2d/shower_of_bullets/bullet.png
new file mode 100644
index 0000000000000000000000000000000000000000..74663741294e94f1fa8dd68a584ed0a4f82b4b2f
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0CoWF
z0F27zBIp1B010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U|d3C?bx6|7-vN0cuG^
zK~z}7?Ul_-0#Ovje>X$Qgv?E?QfVPBTNSu%*Z<qDMGF^!%OEhpS&55?ga*WHZkr=K
zLh9-0syT3(;l2CjoOkDbK!E}U{yS`wL+*a0*Q%Z=;AWQYT!6cu0&SoP9BO$6jDUfe
zO?Dzcw{8Gk;93G|+MWUl@CfvP#LPZozPrDM*amO|+$sWfpsc-5-~u=Y4uE^$X=?%$
z_O8e;ffJw<xRgb_%#FFbzsCHIy~xnF74~*OZa=I99Lwhl=(u||w*a9js|Vz(@~Nb}
zXvu6F0;<aPTJX<*Ls`C+piFZ|U}uOCkgCq7%J#poknc=qa|>`anFM$PzO=T=FOyFq
z%W?})dmX6Byy$jI5us(kJ1_+Lz;jFlqWXZDP29bwT1TZ8Cgnmm9|Cv4128r--)1LF
z)Zyl;^VW)1+!y&MhJ4dubOv-Jpb`wDL}4GtlII!6Rh<pTaR#L8kQXRWpa8%(6`XJr
T&b8$k00000NkvXXu0mjfH%-Zk

literal 0
HcmV?d00001

diff --git a/2d/shower_of_bullets/bullets.gd b/2d/shower_of_bullets/bullets.gd
new file mode 100644
index 00000000..f76fcc38
--- /dev/null
+++ b/2d/shower_of_bullets/bullets.gd
@@ -0,0 +1,76 @@
+
+extends Node2D
+
+# This demo is an example of controling a high number of 2D objects with logic and collision without using scene nodes.
+# This technique is a lot more efficient than using instancing and nodes, but requires more programming and is less visual
+
+const BULLET_COUNT = 500
+const SPEED_MIN = 20
+const SPEED_MAX = 50
+
+var bullets=[]
+var shape
+
+class Bullet:
+	var pos = Vector2()
+	var speed = 1.0
+	var body = RID()
+	
+
+func _draw():
+
+	var t = preload("res://bullet.png")
+	var tofs = -t.get_size()*0.5
+	for b in bullets:
+		draw_texture(t,b.pos+tofs)	
+		
+	
+func _process(delta):
+	var width = get_viewport_rect().size.x*2.0
+	var mat = Matrix32()
+	for b in bullets:
+		b.pos.x-=b.speed*delta
+		if (b.pos.x < -30):
+			b.pos.x+=width
+		mat.o=b.pos		
+		
+		Physics2DServer.body_set_state(b.body,Physics2DServer.BODY_STATE_TRANSFORM,mat)
+		
+	update()
+		
+			
+func _ready():
+
+	shape = Physics2DServer.shape_create(Physics2DServer.SHAPE_CIRCLE)
+	Physics2DServer.shape_set_data(shape,8) #radius
+
+	for i in range(BULLET_COUNT):
+		var b = Bullet.new()
+		b.speed=rand_range(SPEED_MIN,SPEED_MAX)
+		b.body = Physics2DServer.body_create(Physics2DServer.BODY_MODE_KINEMATIC)
+		Physics2DServer.body_set_space(b.body,get_world_2d().get_space())
+		Physics2DServer.body_add_shape(b.body,shape)
+		
+		b.pos = Vector2( get_viewport_rect().size * Vector2(randf()*2.0,randf()) ) #twice as long
+		b.pos.x += get_viewport_rect().size.x # start outside
+		var mat = Matrix32()
+		mat.o=b.pos
+		Physics2DServer.body_set_state(b.body,Physics2DServer.BODY_STATE_TRANSFORM,mat)
+		
+		bullets.append(b)
+		
+		
+	set_process(true)
+		
+	
+func _exit_tree():
+	for b in bullets:
+		Physics2DServer.free(b.body)
+	
+	Physics2DServer.free(shape)
+	# Initalization here
+	bullets.clear()
+	
+	pass
+
+
diff --git a/2d/shower_of_bullets/engine.cfg b/2d/shower_of_bullets/engine.cfg
new file mode 100644
index 00000000..cad57519
--- /dev/null
+++ b/2d/shower_of_bullets/engine.cfg
@@ -0,0 +1,16 @@
+[application]
+
+name="Bullet Shower"
+main_scene="res://shower.scn"
+icon="res://icon.png"
+
+[display]
+
+width=1024
+height=600
+resizable=true
+stretch_aspect="keep"
+
+[physics_2d]
+
+cell_size=64
diff --git a/2d/shower_of_bullets/face_happy.png b/2d/shower_of_bullets/face_happy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ed643b62d5425e37ef9a1d517e56ce14e135610
GIT binary patch
literal 1243
zcmV<11SI>3P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0CoWF
z0F27zBIp1B010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U|d3CoTZ2uZREu1ZYV_
zK~#9!?VE3CR#h0le~U(_DZ~i{C5J|ZC`%?mG#VDv1Op>TsZT*gNst=H^T8$vYkfE#
z41-#NL48SQpcxIcpk%QKQgNwBg~=9^CS3waBi=84xQ{W`z3;u}-uJzGci;Dc!FJEN
z&!6AUdCs}_JQrHhl9n{Hv=w2*1g;Bs1Xv5)58MOX4a}D=H-SHZ-+-TibHI02>9cbd
zfC=1Vz!u;sU|B{rlfW0ikX8DdIRU@~?j>L=&{bpAXMsVh^udM%U;?)p*bS_y^QgT5
z^joEmGz0(>xTU~5z~+MU*AZZcRr>0z0Wg7k8aMzfo~0yy4S2;W{aIE8x8(?41IK1D
zc*OQG@ufHbCU675-UeFE_li&T2Ver%5A15dJ<Trht$sPc1nzZUe}ixCwppd$tvLV_
zxL)AI9NFP+uu7k-*%UB=TL=uM*tHp;6PPDIopNomU;u;SbE4dyQsF*eMV0nXWI6h4
z#`W{Sc@wxnSuUS12*3*Q`Q_YGzy$6I;L9pqzO_pCq#Q{jz@r6@geR@iU*(+weF^Q>
z!y#MnROri<15DsH0ZISe5f6t(G6v#+hve~jzWnY|+}9&9WX=Iw8z7^<V3q!O#<kPH
zX%n~$z(*-!IPN_HOyE`ny=f?W1k;lNz^578Zb`4i;ynenq}?L;?4>dQcs65Os#w~p
zjDT~%gDDNfErYjo-I;S4bifdBQT|>nL8W~N8na5TO%1>VZaFaS>ExtrlTQG@$hG@`
z4Zt?CzZR>NbXcV)(k8*~3<j3TGG}Q_=>{g!=74pSPuBS)!Br&$u*wHOM+pIR_yAZ^
zLI6vA04ypYfJHt4+Diza-3LIWga9f&0Iru1z;z!0QzZm2<pW^6gaF2U09+~|fJ;6A
z&Xf?q86N<nB?K^<8h|`Dj+H3*v8YGkY9j#P^AZ7wjinlZp%MWY@&;g)z6hi_U%LSu
zo`s+ei|r&iDY1Bu07yO$1lR-YAS`t&N^XkHJt_KDjiD+4tMqY_4>OKhrGE!@76@Rc
z*gTrhZ$x4s>j(gNE1`WtV7(6v6cGG?*!s_Q4&Rdj$l+qO+Pvk{`t||a>lplYvGG6K
z5ppo;U^MLr0C)qq64Um~3}E{SizJ6@82B*ICAwp6Pm?R+bE4FuLgWU}X_fvp;-1HW
z7YR>rd|$Fu2#>x#v`T*+p?f9pBd{Ri-qaN$wW<;N9@u1+z7})e9faqM-Go&m_Y%IN
zTQCjc6mVIB8kObipBR0M2@gCUj%cn=jnFjX{Y0O;{{*~hl|EI^3}^zk9{2!wAS&ru
zrFZ-2Ys=`w0P&@A?*aRwrbN!bSIWG8EvC!cR_Ql=^|s}3NK?I7@(^J?@32+6lF>#x
zu#vD1`MHFBfy-i}h+5$aa0>W=u+sZ7a25Cy_*?qS1MUKrN`6>FSOu~^A$jJm6>e3F
z*Km$D=l22;Ae!@wkq8jY`OQ!ajE4PctR*dJNlThq{slAnSKVnf;Ozha002ovPDHLk
FV1mq|De?dS

literal 0
HcmV?d00001

diff --git a/2d/shower_of_bullets/face_sad.png b/2d/shower_of_bullets/face_sad.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6318b20a3875962b3b306c6cafe004822a77af3
GIT binary patch
literal 1240
zcmV;}1Sk86P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0CoWF
z0F27zBIp1B010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U|d3CpTor2S@+_1Z7D?
zK~#9!?VC@CRaG3vKSz>EN`g|Up=Mk-AY-PZElQebVKZQm7%9{yBC**x6w~m-Y-Pre
zaVT>03|!QrzzKDdAg6(%iK#^@h9d*cLPr@xQ3#7DT$~p72r<2P-#Pc*cjwK0?+XL-
z?w@mhzt27Q_dEC8--V`{YO0ZC^612hbOKKU>wtFPQQ#q9i96&k;0AC7xB#35eln_O
z7AycO@*J=OcmZfh*vu^OHE_hJe!n09Sdlk?UZ6AMrq2K+qk6b50a%gkz<a=&8jspZ
zV4qPPt_uKG<PqQ_V0+H-YZ!RTs9v2n09Irx@CmSdo`U#wV3$!HN!q}o6wdbp$LG;`
zT;Io?E%^bkBKv^@b(GEzIGbt@z>4ex_SE5=W{<P2b}_(;>;^ur^T}PGQ9YPB04vfB
zoLnF?+#aJkn%OO2MeYYm9<#OqU@dU3`&;X_&E^cC<ZQ00yF45G5Lg+r{|lFn{+zS@
z9B|Hxlw7)eB_{wYoy|K_-vU--Gw^N9AwL?`F3*uP4m^|NNO<0;j-|Z?_Ey<H7+}y~
z&bPweR58Gcya-ggy5j)`jVE+u2zb&xJ}+_q4|$x|<$OpS1A6NqqQ7QTKby1d6mZIl
zOah;J`0!Qm2(Tg@K(`O&0B5=q0QfTDzB}r6z69R_J3I{>2ykW~0f3hi?(_1+#EgKm
zz!RPwR7!()+PW`g8XN+S0O#HB4(F8bL(s2Ab)7c=EAkjH6KLeDn<k$GrrowxKo8JI
z@@28C)M`{O`v$>H2|8$TX>O4E)F$AvZw%N#@w6c%2(B(5fYl)YS_=rEH3Yzl0s>eO
z0$^zY0W1vxu(*H#7KZ@1T|fZ0Ljc?=Ab?vT0In4fz_kznGX(@N69QnWfB>dK0Guu$
zfYTuWCJG2(qL%9czPjNamnVpp%r5~qfq#Izfd_#$;Boi#)<aZElU5bi1LD>MPh<#S
z3^-&|kHsAGw_8(~b$|}J3$YD&6WE-h{}YvV#EpOsqH2sZx&-ta)uU+%T9KECR)*RV
zoW91Wo)3uuxD!TG*!&H!F$?FNJx76!uH6ugR&qWTfKw@<z25;_jOxuS1Bh#Hi)-Ik
zu|D{`8vB9p<?ME&I$f)9ZbeoR)e~0JxKVvJ?f{=xWA6vrr?qt6jf81Hv#@=UM`vR|
zNNwJ+obr0LehycAG3q-40Nw^JdLBEO6M(pWE;^gZ1b|WfgZg++=&N35Gg*xQT**nF
zPtMKB$x8k7`Ig62n+cYKaL|e@BmTYnHsF^sk$btD-gXi#QMUmP0}lZA{AV`!JMf#E
zL`@OZ2u~Q*>t*`+U(gFFkn&1{71Gdt;!EY)jq0=&X#rjZwgOM3yy8CtBf#fGH3D<f
z;0H$a-QbLpA{X~lxmfawoBzL_)9vt%Q5{NhVzX8_<%DDeSWi^BowtU8^=X_>Jp$&8
zhQ|C}pbUt{{9>dGh{pV8r~-_-{c5bKrkZN1q4h7`7)$3NkibX)0000<MNUMnLSTZv
CTPZjI

literal 0
HcmV?d00001

diff --git a/2d/shower_of_bullets/icon.png b/2d/shower_of_bullets/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..432c74a5a34e1e29f83ac5942eac6e834b4a96a1
GIT binary patch
literal 2777
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

literal 0
HcmV?d00001

diff --git a/2d/shower_of_bullets/shower.gd b/2d/shower_of_bullets/shower.gd
new file mode 100644
index 00000000..bba84317
--- /dev/null
+++ b/2d/shower_of_bullets/shower.gd
@@ -0,0 +1,32 @@
+
+extends Node2D
+
+# member variables here, example:
+# var a=2
+# var b="textvar"
+
+var touching=0
+
+func _input(ev):
+
+	if (ev.type==InputEvent.MOUSE_MOTION):
+		get_node("player").set_pos(ev.pos-Vector2(0,16))
+
+
+func _on_player_body_enter_shape( body_id, body, body_shape, area_shape ):
+
+	touching+=1
+	if (touching==1):
+		get_node("player/sprite").set_frame(1)
+
+
+func _on_player_body_exit_shape( body_id, body, body_shape, area_shape ):
+
+	touching-=1
+	if (touching==0):
+		get_node("player/sprite").set_frame(0)
+
+
+func _ready():
+	set_process_input(true)
+	pass
diff --git a/2d/shower_of_bullets/shower.scn b/2d/shower_of_bullets/shower.scn
new file mode 100644
index 0000000000000000000000000000000000000000..648888d099c818c31a55c6a0be29607c092f9421
GIT binary patch
literal 1836
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
KPf1h!o%|nQ=rv9N

literal 0
HcmV?d00001

diff --git a/misc/autoload/global.gd b/misc/autoload/global.gd
index d9fa308a..a0415c6e 100644
--- a/misc/autoload/global.gd
+++ b/misc/autoload/global.gd
@@ -12,12 +12,12 @@ func goto_scene(scene):
 	#instance the new scene
 	current_scene = s.instance()
 	#add it to the active scene, as child of root
-	get_scene().get_root().add_child(current_scene)
+	get_tree().get_root().add_child(current_scene)
 
 
 func _ready():
 	# get the current scene
 	# it is always the last child of root,
 	# after the autoloaded nodes
-	var root = get_scene().get_root()
+	var root = get_tree().get_root()
 	current_scene = root.get_child( root.get_child_count() -1 )
diff --git a/misc/pause/spinpause.gd b/misc/pause/spinpause.gd
index c21c13b4..1b8f8388 100644
--- a/misc/pause/spinpause.gd
+++ b/misc/pause/spinpause.gd
@@ -5,11 +5,11 @@ extends Spatial
 func _on_pause_pressed():
 	get_node("pause_popup").set_exclusive(true)
 	get_node("pause_popup").popup()
-	get_scene().set_pause(true)
+	get_tree().set_pause(true)
 
 
 func _on_unpause_pressed():
 	get_node("pause_popup").hide()
-	get_scene().set_pause(false)
+	get_tree().set_pause(false)