From 6a358681ed0870a1a3131f224a05746e331ed8ca Mon Sep 17 00:00:00 2001 From: Joe Shochet Date: Thu, 23 May 2002 23:17:59 +0000 Subject: [PATCH] *** empty log message *** --- direct/src/doc/pandaUserGuide.doc | Bin 106496 -> 105984 bytes direct/src/ffi/FFIOverload.py | 3 ++- direct/src/ffi/FFISpecs.py | 2 +- direct/src/gui/DirectGui.py | 3 +++ direct/src/gui/DirectGuiBase.py | 3 +++ direct/src/gui/DirectGuiGlobals.py | 13 +++++++++---- direct/src/task/Task.py | 1 + 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/direct/src/doc/pandaUserGuide.doc b/direct/src/doc/pandaUserGuide.doc index ae7a7e4e49b778d45c145211b2843dc3c56585b1..83af0b5b371726687cd0b58c47655d8b359ea59f 100644 GIT binary patch delta 15558 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 delta 15525 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 diff --git a/direct/src/ffi/FFIOverload.py b/direct/src/ffi/FFIOverload.py index bacd2fb334..989db63d9a 100644 --- a/direct/src/ffi/FFIOverload.py +++ b/direct/src/ffi/FFIOverload.py @@ -219,6 +219,7 @@ class FFIMethodArgumentTreeCollection: else: indent(file, nesting+1, 'def ' + self.methodSpecList[0].name + '(self, *_args):\n') + self.methodSpecList[0].outputCFunctionComment(file, nesting+2) indent(file, nesting+2, 'numArgs = len(_args)\n') def outputOverloadedMethodFooter(self, file, nesting): @@ -251,7 +252,7 @@ class FFIMethodArgumentTreeCollection: tree = FFIMethodArgumentTree(self.classTypeDesc, methodList) treeList = ifAbsentPut(self.treeDict, numArgs, []) treeList.append(tree) - + def generateCode(self, file, nesting): self.setup() self.outputOverloadedMethodHeader(file, nesting) diff --git a/direct/src/ffi/FFISpecs.py b/direct/src/ffi/FFISpecs.py index 8b429e6fe2..2502a4a55e 100644 --- a/direct/src/ffi/FFISpecs.py +++ b/direct/src/ffi/FFISpecs.py @@ -89,7 +89,7 @@ class FunctionSpecification: So "getChild(int)" becomes "overloaded_getChild_int(int)" """ if self.overloaded: - name = 'overloaded_' + self.name + name = '__overloaded_' + self.name for methodArgSpec in self.typeDescriptor.argumentTypes: name = name + '_' + methodArgSpec.typeDescriptor.foreignTypeName return name diff --git a/direct/src/gui/DirectGui.py b/direct/src/gui/DirectGui.py index 4a7eb721e2..848fedc8b5 100644 --- a/direct/src/gui/DirectGui.py +++ b/direct/src/gui/DirectGui.py @@ -1,4 +1,7 @@ from DirectGuiGlobals import * +from OnscreenText import * +from OnscreenGeom import * +from OnscreenImage import * # Set up default font PGItem.getTextNode().setFont(getDefaultFont()) diff --git a/direct/src/gui/DirectGuiBase.py b/direct/src/gui/DirectGuiBase.py index f4aec3f09a..30508896b2 100644 --- a/direct/src/gui/DirectGuiBase.py +++ b/direct/src/gui/DirectGuiBase.py @@ -1,4 +1,7 @@ from DirectGuiGlobals import * +from OnscreenText import * +from OnscreenGeom import * +from OnscreenImage import * from DirectUtil import ROUND_TO import PandaObject import Task diff --git a/direct/src/gui/DirectGuiGlobals.py b/direct/src/gui/DirectGuiGlobals.py index db43634474..5166b3371b 100644 --- a/direct/src/gui/DirectGuiGlobals.py +++ b/direct/src/gui/DirectGuiGlobals.py @@ -68,6 +68,7 @@ MIDGROUND_SORT_INDEX = 0 FOREGROUND_SORT_INDEX = 100 defaultFont = None +defaultFontName = "models/fonts/Comic" defaultClickSound = None defaultRolloverSound = None defaultDialogGeom = None @@ -97,13 +98,17 @@ def setDefaultClickSound(newSound): def getDefaultFont(): global defaultFont if defaultFont == None: - defaultFont = loader.loadFont("models/fonts/Comic") + defaultFont = loader.loadFont(defaultFontName) return defaultFont def setDefaultFont(newFont): global defaultFont defaultFont = newFont +def setDefaultFontName(newFontName): + global defaultFontName + defaultFontName = newFontName + def getDefaultDialogGeom(): global defaultDialogGeom if defaultDialogGeom == None: @@ -128,6 +133,6 @@ def setDefaultPanel(newPanel): global panel panel = newPanel -from OnscreenText import * -from OnscreenGeom import * -from OnscreenImage import * +#from OnscreenText import * +#from OnscreenGeom import * +#from OnscreenImage import * diff --git a/direct/src/task/Task.py b/direct/src/task/Task.py index bc4f5aed5f..241ef51734 100644 --- a/direct/src/task/Task.py +++ b/direct/src/task/Task.py @@ -547,3 +547,4 @@ class TaskManager: # you must manually tick the clock # Ask for the time last frame return globalClock.getFrameTime(), globalClock.getFrameCount() +