From 7b1c301acf07d84b347588e681d1ed80105dd144 Mon Sep 17 00:00:00 2001 From: Joe Shochet Date: Wed, 29 Nov 2000 18:41:40 +0000 Subject: [PATCH] *** empty log message *** --- direct/src/directutil/DirectCameraControl.py | 2 +- direct/src/directutil/DirectGrid.py | 4 ++-- direct/src/directutil/DirectManipulation.py | 2 +- direct/src/gui/Button.py | 2 +- direct/src/gui/Frame.py | 2 +- direct/src/gui/ScrollingLabel.py | 2 +- direct/src/leveleditor/LevelEditor.py | 13 +++++-------- direct/src/showbase/OnscreenText.py | 2 +- 8 files changed, 13 insertions(+), 16 deletions(-) diff --git a/direct/src/directutil/DirectCameraControl.py b/direct/src/directutil/DirectCameraControl.py index 21182bd7b2..465b033807 100644 --- a/direct/src/directutil/DirectCameraControl.py +++ b/direct/src/directutil/DirectCameraControl.py @@ -12,7 +12,7 @@ class DirectCameraControl(PandaObject): self.orthoViewRoll = 0.0 self.lastView = 0 self.coa = Point3(0) - self.coaMarker = loader.loadModel('misc/sphere') + self.coaMarker = loader.loadModel('models/misc/sphere') self.coaMarker.setColor(1,0,0) self.coaMarkerPos = Point3(0) self.relNodePath = render.attachNewNode(NamedNode('targetNode')) diff --git a/direct/src/directutil/DirectGrid.py b/direct/src/directutil/DirectGrid.py index f88796db1d..9ce8ea56f9 100644 --- a/direct/src/directutil/DirectGrid.py +++ b/direct/src/directutil/DirectGrid.py @@ -12,7 +12,7 @@ class DirectGrid(NodePath,PandaObject): # Load up grid parts to initialize grid object # Polygon used to mark grid plane - self.gridBack = loader.loadModel('misc/gridBack') + self.gridBack = loader.loadModel('models/misc/gridBack') self.gridBack.reparentTo(self) self.gridBack.setColor(0.5,0.5,0.5,0.5) @@ -34,7 +34,7 @@ class DirectGrid(NodePath,PandaObject): self.centerLines.setThickness(3) # Small marker to hilight snap-to-grid point - self.snapMarker = loader.loadModel('misc/sphere') + self.snapMarker = loader.loadModel('models/misc/sphere') self.snapMarker.node().setName('gridSnapMarker') self.snapMarker.reparentTo(self) self.snapMarker.setColor(1,0,0,1) diff --git a/direct/src/directutil/DirectManipulation.py b/direct/src/directutil/DirectManipulation.py index 9a35727294..58ffb401dc 100644 --- a/direct/src/directutil/DirectManipulation.py +++ b/direct/src/directutil/DirectManipulation.py @@ -503,7 +503,7 @@ class ObjectHandles(NodePath,PandaObject): NodePath.__init__(self) # Load up object handles model and assign it to self - self.assign(loader.loadModel('misc/objectHandles')) + self.assign(loader.loadModel('models/misc/objectHandles')) self.node().setName('objectHandles') self.scalingNode = self.getChild(0) self.scalingNode.node().setName('ohScalingNode') diff --git a/direct/src/gui/Button.py b/direct/src/gui/Button.py index 5f06c02426..7ad151b6fc 100644 --- a/direct/src/gui/Button.py +++ b/direct/src/gui/Button.py @@ -5,7 +5,7 @@ import GuiButton import Vec3 guiMgr = GuiManager.GuiManager.getPtr(base.win, base.mak.node()) -font = (loader.loadModelOnce("fonts/ttf-comic")).node() +font = (loader.loadModelOnce("phase_3/models/fonts/ttf-comic")).node() class Button: diff --git a/direct/src/gui/Frame.py b/direct/src/gui/Frame.py index 4d68b0f39e..4e0f04faba 100644 --- a/direct/src/gui/Frame.py +++ b/direct/src/gui/Frame.py @@ -4,7 +4,7 @@ import GuiFrame import Vec3 guiMgr = GuiManager.GuiManager.getPtr(base.win, base.mak.node()) -font = (loader.loadModelOnce("fonts/ttf-comic")).node() +font = (loader.loadModelOnce("phase_3/models/fonts/ttf-comic")).node() class Frame: diff --git a/direct/src/gui/ScrollingLabel.py b/direct/src/gui/ScrollingLabel.py index 1abdb6c42c..d490a08184 100644 --- a/direct/src/gui/ScrollingLabel.py +++ b/direct/src/gui/ScrollingLabel.py @@ -6,7 +6,7 @@ import Button import GuiLabel import Sign -font = (loader.loadModelOnce("fonts/ttf-comic")).node() +font = (loader.loadModelOnce("phase_3/models/fonts/ttf-comic")).node() class ScrollingLabel(PandaObject.PandaObject): diff --git a/direct/src/leveleditor/LevelEditor.py b/direct/src/leveleditor/LevelEditor.py index 04711b70bc..af670d3d15 100644 --- a/direct/src/leveleditor/LevelEditor.py +++ b/direct/src/leveleditor/LevelEditor.py @@ -11,7 +11,7 @@ import Pmw import EntryScale import VectorWidgets import string - +import os class LevelEditor(NodePath, PandaObject): """Class used to create a Toontown LevelEditor object""" @@ -1087,8 +1087,7 @@ class LevelEditor(NodePath, PandaObject): def createColorDictionaryFromFile(self, filename): print 'Loading Color Palettes from: ' + filename - f = Filename(filename) - f.resolveFilename(getModelPath()) + fname = Filename(os.path.join(os.expandVars('$TTMODELS/src'), filename)) f = open(f.toOsSpecific(), 'r') rawData = f.readlines() f.close() @@ -1139,8 +1138,7 @@ class LevelEditor(NodePath, PandaObject): return # Valid type, add color to file filename = 'level_editor/' + self.editMode + 'Colors.txt' - f = Filename(filename) - f.resolveFilename(getModelPath()) + fname = Filename(os.path.join(os.expandVars('$TTMODELS/src'), filename)) f = open(f.toOsSpecific(), 'a') f.write('%s Vec4(%.2f, %.2f, %.2f, 1.0)\n' % (tag, @@ -1546,9 +1544,8 @@ class LevelEditor(NodePath, PandaObject): return styleDictionary def getStyleData(self, filename): - f = Filename(filename) - f.resolveFilename(getModelPath()) - f = open(f.toOsSpecific(), 'r') + fname = Filename(os.path.join(os.expandVars('$TTMODELS/src'), filename)) + f = open(fname.toOsSpecific(), 'r') rawData = f.readlines() f.close() styleData = [] diff --git a/direct/src/showbase/OnscreenText.py b/direct/src/showbase/OnscreenText.py index 5f3b452751..8e962abbf3 100644 --- a/direct/src/showbase/OnscreenText.py +++ b/direct/src/showbase/OnscreenText.py @@ -4,7 +4,7 @@ from PandaObject import * class OnscreenText(PandaObject, NodePath): - Font = loader.loadModelOnce("fonts/ttf-comic").node() + Font = loader.loadModelOnce("phase_3/models/fonts/ttf-comic").node() def __init__(self, string, x=0.0, y=0.0): """__init__(self, string, float=0.0, float=0.0)