Skip to content

Commit 9637ce6

Browse files
author
Mark Mine
committed
*** empty log message ***
1 parent 00b9fde commit 9637ce6

File tree

6 files changed

+98
-36
lines changed

6 files changed

+98
-36
lines changed

‎direct/src/directtools/DirectManipulation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self):
2626
self.actionEvents = [
2727
['handleMouse1', self.manipulationStart],
2828
['handleMouse1Up', self.manipulationStop],
29-
['space', self.toggleObjectHandlesMode],
29+
['tab', self.toggleObjectHandlesMode],
3030
['.', self.objectHandles.multiplyScalingFactorBy, 2.0],
3131
['>', self.objectHandles.multiplyScalingFactorBy, 2.0],
3232
[',', self.objectHandles.multiplyScalingFactorBy, 0.5],

‎direct/src/directtools/DirectSession.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,11 @@ def __init__(self):
8484
['SGENodePath_Place', Placer.place],
8585
['SGENodePath_Delete', self.removeNodePath],
8686
]
87-
self.keyEvents = ['left', 'right', 'up', 'down',
88-
'escape', 'delete', 'control', 'control-up',
87+
self.keyEvents = ['escape', 'delete', 'control', 'control-up',
8988
'shift', 'shift-up', 'alt', 'alt-up',
90-
'page_up', 'page_down', 'tab',
89+
'page_up', 'page_down',
9190
'[', '{', ']', '}',
92-
'b', 'l', 's', 't', 'v', 'w']
91+
'A', 'b', 'l', 's', 't', 'v', 'w']
9392
self.mouseEvents = ['mouse1', 'mouse1-up',
9493
'mouse2', 'mouse2-up',
9594
'mouse3', 'mouse3-up']
@@ -210,7 +209,7 @@ def inputHandler(self, input):
210209
self.deselectAll()
211210
elif input == 'delete':
212211
self.removeAllSelected()
213-
elif input == 'tab':
212+
elif input == 'v':
214213
self.toggleWidgetVis()
215214
elif input == 'b':
216215
base.toggleBackface()
@@ -221,7 +220,7 @@ def inputHandler(self, input):
221220
self.select(self.selected.last)
222221
elif input == 't':
223222
base.toggleTexture()
224-
elif input == 'v':
223+
elif input == 'A':
225224
self.selected.toggleVisAll()
226225
elif input == 'w':
227226
base.toggleWireframe()

‎direct/src/doc/DIRECT-hotkeys‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# UNDO/REDO
2+
[ undo
3+
] redo
4+
5+
# CAMERA MOVES
6+
+ zoomCam in
7+
- zoomCam out
8+
1 front view
9+
2 back view
10+
3 right view
11+
4 left view
12+
5 top view
13+
6 bottom view
14+
7 3/4 view
15+
8 roll view
16+
9 swing camera about hot point
17+
0 swing camera about hot point
18+
c center on hot point
19+
f fit on hot point
20+
h move camera to home (0,0,0)
21+
u orbit upright cam about hot point
22+
U upright cam
23+
` kill camera move task
24+
25+
# RENDER STYLE
26+
A show all
27+
b toggle backface
28+
l toggle lights
29+
t toggle texture
30+
w toggle wireframe
31+
32+
# DIRECT CONTROLS
33+
delete delete selected object
34+
escape deselect all
35+
page_down move down selected objects hierarchy
36+
page_up move up selected objects hierarchy
37+
F grow widget to fit current view
38+
m move widget in front of camera
39+
p plant selected object at cursor intersection point
40+
s (re)select last selected object
41+
v toggle widget visability
42+
tab toggle widget mode (move objects or set center of action)
43+
< shrink widget
44+
> expand widget
45+
46+
# LEVEL EDITOR
47+
insert add new object of current object type
48+
space add exact copy of current object
49+
right move selected object right (in screen space)
50+
left move selected object left (in screen space)
51+
down move selected object down (in screen space)
52+
up move selected object up (in screen space)
53+
a auto position snap point to selected object
54+
j move selected object to snap point
55+
56+
57+
58+
59+
==================================================

‎direct/src/leveleditor/LevelEditor.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ def __init__(self):
295295
('select_prop_color', self.setDNATargetColor),
296296
# Hot key actions
297297
('a', self.autoPositionGrid),
298-
('.', self.jumpToInsertionPoint),
298+
('j', self.jumpToInsertionPoint),
299299
('left', self.keyboardXformSelected, ['left']),
300300
('right', self.keyboardXformSelected, ['right']),
301301
('up', self.keyboardXformSelected, ['up']),

‎direct/src/showbase/Messenger.py‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,16 @@ def listAllEvents(self):
120120
keys.sort()
121121
for event in keys:
122122
str = str + 'Event: ' + event + '\n'
123+
acceptorDict = self.dict[event]
124+
for object in acceptorDict.keys():
125+
method, extraArgs, persistent = acceptorDict[object]
126+
className = object.__class__.__name__
127+
methodName = method.__name__
128+
str = str + '\t' + className + '.' + methodName + '('
129+
if extraArgs:
130+
str = str + `extraArgs` + ' + '
131+
str = str + 'sentArgs)\n'
132+
str = str + '\n'
123133
str = str + '='*50 + '\n'
124134
print str
125135

@@ -147,23 +157,3 @@ def __repr__(self):
147157
str = str + '='*50 + '\n'
148158
return str
149159

150-
def __reprehensible__(self):
151-
"""__repr__(self)
152-
Old way to print out the table in a readable format
153-
"""
154-
str = 'Messenger\n'
155-
str = str + '='*50 + '\n'
156-
for event in self.dict.keys():
157-
acceptorDict = self.dict[event]
158-
str = str + event + '\n'
159-
for object in acceptorDict.keys():
160-
method, extraArgs, persistent = acceptorDict[object]
161-
str = str + '\t' + `object` + '\n\t' + `method` + '\n\t' + `extraArgs` + ' ' + `persistent` + '\n'
162-
str = str + '='*50 + '\n'
163-
return str
164-
165-
166-
167-
168-
169-

‎direct/src/tkpanels/ParticlePanel.py‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -600,22 +600,36 @@ def createInterface(self):
600600
forceMenu.add_command(label = 'Add Linear Friction Force',
601601
command = self.addLinearFrictionForce)
602602
"""
603-
forceMenu.add_command(label = 'Add Linear Cylinder Vortex Force',
604-
command = self.addLinearCylinderVortexForce)
605-
forceMenu.add_command(label = 'Add Linear Distance Force',
606-
command = self.addLinearDistanceForce)
603+
# derive from RANDOM derives from Linear Force
604+
# setAmplitude <function setAmplitude at 01CAE3DC>
605+
# setMassDependent <function setMassDependent at 01CAE08C>
606+
# setVectorMasks <function setVectorMasks at 01CAFF0C>
607607
forceMenu.add_command(label = 'Add Linear Jitter Force',
608608
command = self.addLinearJitterForce)
609609
forceMenu.add_command(label = 'Add Linear Noise Force',
610610
command = self.addLinearNoiseForce)
611-
forceMenu.add_command(label = 'Add Linear Random Force',
612-
command = self.addLinearRandomForce)
611+
# setCoef <function setCoef at 01CAF14C>
612+
# setLength <function setLength at 01C7F34C>
613+
# setRadius <function setRadius at 01CAF08C>
614+
forceMenu.add_command(label = 'Add Linear Cylinder Vortex Force',
615+
command = self.addLinearCylinderVortexForce)
616+
forceMenu.add_command(label = 'Add Linear User Defined Force',
617+
command = self.addLinearUserDefinedForce)
618+
# Also friction
619+
620+
# Linear Distance force
621+
# setFalloffType <function setFalloffType at 01F300BC>
622+
# setForceCenter <function setForceCenter at 01F3005C>
623+
# setRadius <function setRadius at 01F3031C>
613624
forceMenu.add_command(label = 'Add Linear Sink Force',
614625
command = self.addLinearSinkForce)
615626
forceMenu.add_command(label = 'Add Linear Source Force',
616627
command = self.addLinearSourceForce)
617-
forceMenu.add_command(label = 'Add Linear User Defined Force',
618-
command = self.addLinearUserDefinedForce)
628+
629+
forceMenu.add_command(label = 'Add Linear Distance Force',
630+
command = self.addLinearDistanceForce)
631+
forceMenu.add_command(label = 'Add Linear Random Force',
632+
command = self.addLinearRandomForce)
619633
"""
620634
self.addForceButton.pack(expand = 0)
621635

0 commit comments

Comments
 (0)