mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-01 09:23:03 -04:00
Use correct find, add otp, fix leveleditor bug
This commit is contained in:
parent
26f83f2970
commit
1b6caf23d0
@ -58,7 +58,7 @@ egg-object-type-dcs <DCS> { 1 }
|
|||||||
# own bin and have them not fight with each other (or with other
|
# own bin and have them not fight with each other (or with other
|
||||||
# transparent geometry).
|
# transparent geometry).
|
||||||
egg-object-type-shadow <Scalar> bin { shadow } <Scalar> alpha { blend-no-occlude }
|
egg-object-type-shadow <Scalar> bin { shadow } <Scalar> alpha { blend-no-occlude }
|
||||||
cull-bin shadow 25 unsorted
|
cull-bin shadow 15 unsorted
|
||||||
|
|
||||||
# The ID of the server that we are compatible with
|
# The ID of the server that we are compatible with
|
||||||
server-version sv1.0.14
|
server-version sv1.0.14
|
||||||
|
@ -2124,7 +2124,7 @@ class LevelEditor(NodePath, PandaObject):
|
|||||||
for selectedNode in direct.selected:
|
for selectedNode in direct.selected:
|
||||||
selectedNode.setHpr(self.getLastAngle(), 0, 0)
|
selectedNode.setHpr(self.getLastAngle(), 0, 0)
|
||||||
# Snap objects to grid and update DNA if necessary
|
# Snap objects to grid and update DNA if necessary
|
||||||
self.updateSelectedPose()
|
self.updateSelectedPose(direct.selected.getSelectedAsList())
|
||||||
if direct.fShift:
|
if direct.fShift:
|
||||||
direct.grid.setSnapAngle(oldSnapAngle)
|
direct.grid.setSnapAngle(oldSnapAngle)
|
||||||
|
|
||||||
@ -2175,7 +2175,7 @@ class LevelEditor(NodePath, PandaObject):
|
|||||||
selectedNode.setPos(direct.grid,
|
selectedNode.setPos(direct.grid,
|
||||||
selectedNode.getPos(direct.grid) + deltaPos)
|
selectedNode.getPos(direct.grid) + deltaPos)
|
||||||
# Snap objects to grid and update DNA if necessary
|
# Snap objects to grid and update DNA if necessary
|
||||||
self.updateSelectedPose()
|
self.updateSelectedPose(direct.selected.getSelectedAsList())
|
||||||
# Restore grid spacing
|
# Restore grid spacing
|
||||||
if direct.fShift:
|
if direct.fShift:
|
||||||
# Use back door to set grid spacing to avoid grid update
|
# Use back door to set grid spacing to avoid grid update
|
||||||
|
@ -2,10 +2,9 @@
|
|||||||
|
|
||||||
# Some Cygwin users don't have find set on on their path correctly, so
|
# Some Cygwin users don't have find set on on their path correctly, so
|
||||||
# we have to be explicit.
|
# we have to be explicit.
|
||||||
PATH=/bin:$PATH
|
if [ -x /bin/find ]; then
|
||||||
export PATH
|
/bin/find $1 -name \*$2 -print
|
||||||
|
else
|
||||||
find $1 -name "*$2" -print
|
find $1 -name \*$2 -print
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -59,6 +59,7 @@ echo $PANDA/lib/libpandadx8.dll
|
|||||||
echo $PANDA/lib/libpandagl.dll
|
echo $PANDA/lib/libpandagl.dll
|
||||||
echo $PANDA/lib/libmiles_audio.dll
|
echo $PANDA/lib/libmiles_audio.dll
|
||||||
echo $DIRECT/lib/libdirect.dll
|
echo $DIRECT/lib/libdirect.dll
|
||||||
|
echo $OTP/lib/libotp.dll
|
||||||
echo $TOONTOWN/lib/libtoontown.dll
|
echo $TOONTOWN/lib/libtoontown.dll
|
||||||
|
|
||||||
# Generated code for libpandaexpress
|
# Generated code for libpandaexpress
|
||||||
|
Loading…
x
Reference in New Issue
Block a user