From 1354fbf5cd0815948f287de4b8ef8465ac6d435d Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 27 Jul 2013 11:09:34 +0000 Subject: [PATCH] Some fixes (but still doesn't run due to missing Lerp class) --- contrib/src/sceneeditor/SideWindow.py | 4 ++-- contrib/src/sceneeditor/sceneEditor.py | 7 +++---- contrib/src/sceneeditor/seParticles.py | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/contrib/src/sceneeditor/SideWindow.py b/contrib/src/sceneeditor/SideWindow.py index 99c9260893..f934391dba 100644 --- a/contrib/src/sceneeditor/SideWindow.py +++ b/contrib/src/sceneeditor/SideWindow.py @@ -4,9 +4,9 @@ ################################################################# from direct.tkwidgets.AppShell import AppShell from direct.tkwidgets.VectorWidgets import ColorEntry -from direct.showbase.TkGlobal import spawnTkLoop, Toplevel +from direct.showbase.TkGlobal import spawnTkLoop import seSceneGraphExplorer -from Tkinter import Frame, IntVar, Checkbutton +from Tkinter import Frame, IntVar, Checkbutton, Toplevel import Pmw, Tkinter class sideWindow(AppShell): diff --git a/contrib/src/sceneeditor/sceneEditor.py b/contrib/src/sceneeditor/sceneEditor.py index 46d46e07e1..e47df9ddcb 100644 --- a/contrib/src/sceneeditor/sceneEditor.py +++ b/contrib/src/sceneeditor/sceneEditor.py @@ -5,8 +5,8 @@ except: sys.exit("Please install python module 'Tkinter'") import direct from direct.directbase.DirectStart import* -from direct.showbase.TkGlobal import * -from direct.showbase.TkGlobal import spawnTkLoop, Toplevel +from direct.showbase.TkGlobal import spawnTkLoop +from Tkinter import * from tkFileDialog import * from direct.directtools.DirectGlobals import * from direct.tkwidgets.AppShell import* @@ -40,7 +40,6 @@ import seAnimPanel from direct.task import Task import math - ################################################################# # All scene and windows object will be stored in here. # So, any event which will or need to change contents @@ -1704,6 +1703,6 @@ class myLevelEditor(AppShell): -editor = myLevelEditor(parent = tkroot) +editor = myLevelEditor(parent = base.tkRoot) run() diff --git a/contrib/src/sceneeditor/seParticles.py b/contrib/src/sceneeditor/seParticles.py index 66a23dec9e..c2c86fad55 100644 --- a/contrib/src/sceneeditor/seParticles.py +++ b/contrib/src/sceneeditor/seParticles.py @@ -28,7 +28,7 @@ import os from direct.directnotify import DirectNotifyGlobal import sys -class Particles(ParticleSystem.ParticleSystem): +class Particles(ParticleSystem): notify = DirectNotifyGlobal.directNotify.newCategory('Particles') id = 1