Fixed imports w/ Ralph and unitSquare

WSCU · Jun 26, 2017 · 49f7fa7 · 49f7fa7
1 parent d9df942
commit 49f7fa7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/PandaSRC/Panda.py b/PandaSRC/Panda.py
@@ -12,7 +12,7 @@
 from PandaSRC.Light import *
 from PandaSRC.Slider import slider, sliderHpr, sliderColor, sliderP3
 from PandaFRP.PandaWorld import world, resetWorld
-from PandaSRC.DynamicGeometry import triangle, rectangle, emptyModel, photoWheel, cube, tetra, blastPicture, slicePicture
+from PandaSRC.DynamicGeometry import triangle, rectangle, emptyModel, photoWheel, cube, tetra, blastPicture, slicePicture, unitSquare
 from PandaFRP.PandaHeartbeat import engine as _engine
 from PandaSRC.PEffect import *
 from PandaSRC.Button import button

diff --git a/PandaSRC/PandaModels.py b/PandaSRC/PandaModels.py
@@ -48,13 +48,13 @@ def penguin(**a):
     return pandaModel("Penguin/Penguin.egg", name = "Penguin", **a)
 
 def ralph(**a):
-    return pandaModel(Globals.pandaPath + "/models/Ralph/ralph.egg", name = "Ralph",
+    return pandaModel(PandaGlobals.pandaPath + "/models/Ralph/ralph.egg", name = "Ralph",
 #                        joints = [('neck', 'Neck'), ('leftWrist', 'LeftWrist'),
 #                                 ('rightWrist', 'RightWrist'),
 #                                 ('jaw', 'Jaw'), ('leftElbow', 'LeftElbow'),
 #                                 ('rightShoulder', 'RightShoulder'), ('leftShoulder', 'LeftShoulder'), ('leftKnee', 'LeftKnee'),('rightKnee', 'RightKnee')],
-                                 animation = {"walk" : Globals.pandaPath + "/models/Ralph/ralph-walk.egg","run" : Globals.pandaPath + "/models/Ralph/ralph-run.egg",
-                                 "jump": Globals.pandaPath + "/models/Ralph/ralph-jump.egg","offbalance":Globals.pandaPath + "/models/Ralph/ralph-offbalance.egg"}, frame = 4, **a )
+                                 animation = {"walk" : PandaGlobals.pandaPath + "/models/Ralph/ralph-walk.egg","run" : PandaGlobals.pandaPath + "/models/Ralph/ralph-run.egg",
+                                 "jump": PandaGlobals.pandaPath + "/models/Ralph/ralph-jump.egg","offbalance": PandaGlobals.pandaPath + "/models/Ralph/ralph-offbalance.egg"}, frame = 4, **a )
 
 def bee (**a):
     return pandaModel("Bee/Bee.egg", name = "Bee", **a)

diff --git a/demos/HelloWorld/HelloWorld.py b/demos/HelloWorld/HelloWorld.py
@@ -3,6 +3,6 @@
 
 from PandaSRC.Panda import *
 
-panda()
+ralph()
 
 start()
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,6 @@ @@
     from PandaSRC.Panda import *
-    panda()
+    ralph()
     start()