TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

revert accidental checkin

Browse Source
This commit is contained in:
David Rose 2007-04-04 17:03:15 +00:00
parent f36b15fd99
commit cd85248a06
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
direct/src/actor/Actor.py
View File

@ -308,6 +308,7 @@ class Actor(DirectObject, NodePath):
else: else:
# just copy these to ourselve # just copy these to ourselve
otherCopy = other.copyTo(self) otherCopy = other.copyTo(self)
self.setGeomNode(otherCopy.getChild(0))
# copy the part dictionary from other # copy the part dictionary from other
self.__copyPartBundles(other) self.__copyPartBundles(other)

10
direct/src/interval/LerpInterval.py
View File

@ -6,7 +6,6 @@ from pandac.PandaModules import *
from direct.directnotify.DirectNotifyGlobal import * from direct.directnotify.DirectNotifyGlobal import *
import Interval import Interval
from direct.showbase import LerpBlendHelpers from direct.showbase import LerpBlendHelpers
import profile, pstats
# #
# Most of the intervals defined in this module--the group up here at # Most of the intervals defined in this module--the group up here at
@ -635,15 +634,6 @@ class LerpFunctionInterval(Interval.Interval):
# Initialize superclass # Initialize superclass
Interval.Interval.__init__(self, name, duration) Interval.Interval.__init__(self, name, duration)
def _privStep(self, t):
profile.runctx('self._privStep(t)', globals(), locals(), 't.prof')
print "LerpFunctionInterval %s" % (self.function.__name__)
s = pstats.Stats('t.prof')
s.sort_stats('time')
#s.sort_stats('cumulative')
s.print_stats(5)
self.privStep = self._privStep
def privStep(self, t): def privStep(self, t):
# Evaluate the function # Evaluate the function
if (t >= self.duration): if (t >= self.duration):