TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Joe Shochet 2000-11-29 18:41:40 +00:00
parent ce27f60dee
commit 7b1c301acf
8 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/directutil/DirectCameraControl.py
View File

@ -12,7 +12,7 @@ class DirectCameraControl(PandaObject):
self.orthoViewRoll = 0.0 self.orthoViewRoll = 0.0
self.lastView = 0 self.lastView = 0
self.coa = Point3(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.coaMarker.setColor(1,0,0)
self.coaMarkerPos = Point3(0) self.coaMarkerPos = Point3(0)
self.relNodePath = render.attachNewNode(NamedNode('targetNode')) self.relNodePath = render.attachNewNode(NamedNode('targetNode'))

4
direct/src/directutil/DirectGrid.py
View File

@ -12,7 +12,7 @@ class DirectGrid(NodePath,PandaObject):
# Load up grid parts to initialize grid object # Load up grid parts to initialize grid object
# Polygon used to mark grid plane # 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.reparentTo(self)
self.gridBack.setColor(0.5,0.5,0.5,0.5) self.gridBack.setColor(0.5,0.5,0.5,0.5)
@ -34,7 +34,7 @@ class DirectGrid(NodePath,PandaObject):
self.centerLines.setThickness(3) self.centerLines.setThickness(3)
# Small marker to hilight snap-to-grid point # 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.node().setName('gridSnapMarker')
self.snapMarker.reparentTo(self) self.snapMarker.reparentTo(self)
self.snapMarker.setColor(1,0,0,1) self.snapMarker.setColor(1,0,0,1)

2
direct/src/directutil/DirectManipulation.py
View File

@ -503,7 +503,7 @@ class ObjectHandles(NodePath,PandaObject):
NodePath.__init__(self) NodePath.__init__(self)
# Load up object handles model and assign it to 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.node().setName('objectHandles')
self.scalingNode = self.getChild(0) self.scalingNode = self.getChild(0)
self.scalingNode.node().setName('ohScalingNode') self.scalingNode.node().setName('ohScalingNode')

2
direct/src/gui/Button.py
View File

@ -5,7 +5,7 @@ import GuiButton
import Vec3 import Vec3
guiMgr = GuiManager.GuiManager.getPtr(base.win, base.mak.node()) 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: class Button:

2
direct/src/gui/Frame.py
View File

@ -4,7 +4,7 @@ import GuiFrame
import Vec3 import Vec3
guiMgr = GuiManager.GuiManager.getPtr(base.win, base.mak.node()) 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: class Frame:

2
direct/src/gui/ScrollingLabel.py
View File

@ -6,7 +6,7 @@ import Button
import GuiLabel import GuiLabel
import Sign import Sign
font = (loader.loadModelOnce("fonts/ttf-comic")).node() font = (loader.loadModelOnce("phase_3/models/fonts/ttf-comic")).node()
class ScrollingLabel(PandaObject.PandaObject): class ScrollingLabel(PandaObject.PandaObject):

13
direct/src/leveleditor/LevelEditor.py
View File

@ -11,7 +11,7 @@ import Pmw
import EntryScale import EntryScale
import VectorWidgets import VectorWidgets
import string import string
import os
class LevelEditor(NodePath, PandaObject): class LevelEditor(NodePath, PandaObject):
"""Class used to create a Toontown LevelEditor object""" """Class used to create a Toontown LevelEditor object"""
@ -1087,8 +1087,7 @@ class LevelEditor(NodePath, PandaObject):
def createColorDictionaryFromFile(self, filename): def createColorDictionaryFromFile(self, filename):
print 'Loading Color Palettes from: ' + filename print 'Loading Color Palettes from: ' + filename
f = Filename(filename) fname = Filename(os.path.join(os.expandVars('$TTMODELS/src'), filename))
f.resolveFilename(getModelPath())
f = open(f.toOsSpecific(), 'r') f = open(f.toOsSpecific(), 'r')
rawData = f.readlines() rawData = f.readlines()
f.close() f.close()
@ -1139,8 +1138,7 @@ class LevelEditor(NodePath, PandaObject):
return return
# Valid type, add color to file # Valid type, add color to file
filename = 'level_editor/' + self.editMode + 'Colors.txt' filename = 'level_editor/' + self.editMode + 'Colors.txt'
f = Filename(filename) fname = Filename(os.path.join(os.expandVars('$TTMODELS/src'), filename))
f.resolveFilename(getModelPath())
f = open(f.toOsSpecific(), 'a') f = open(f.toOsSpecific(), 'a')
f.write('%s Vec4(%.2f, %.2f, %.2f, 1.0)\n' % f.write('%s Vec4(%.2f, %.2f, %.2f, 1.0)\n' %
(tag, (tag,
@ -1546,9 +1544,8 @@ class LevelEditor(NodePath, PandaObject):
return styleDictionary return styleDictionary
def getStyleData(self, filename): def getStyleData(self, filename):
f = Filename(filename) fname = Filename(os.path.join(os.expandVars('$TTMODELS/src'), filename))
f.resolveFilename(getModelPath()) f = open(fname.toOsSpecific(), 'r')
f = open(f.toOsSpecific(), 'r')
rawData = f.readlines() rawData = f.readlines()
f.close() f.close()
styleData = [] styleData = []

2
direct/src/showbase/OnscreenText.py
View File

@ -4,7 +4,7 @@ from PandaObject import *
class OnscreenText(PandaObject, NodePath): 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): def __init__(self, string, x=0.0, y=0.0):
"""__init__(self, string, float=0.0, float=0.0) """__init__(self, string, float=0.0, float=0.0)