Thread: [cgkit-commits] cgkit2/cgkit lookat.py,1.1.1.1,1.2 targetcamera.py,1.7,1.8
Brought to you by:
mbaas
From: Matthias B. <mb...@us...> - 2005-07-21 15:07:53
|
Update of /cvsroot/cgkit/cgkit2/cgkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8407 Modified Files: lookat.py targetcamera.py Log Message: Added the roll and up slots Index: lookat.py =================================================================== RCS file: /cvsroot/cgkit/cgkit2/cgkit/lookat.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** lookat.py 12 Dec 2004 14:31:06 -0000 1.1.1.1 --- lookat.py 21 Jul 2005 15:07:11 -0000 1.2 *************** *** 31,45 **** from component import createFunctionComponent from cgtypes import * import scene ! def _lookat(pos, target): ! global up try: - up = scene.getScene().up M = mat4().lookAt(pos, target, up) except: M = mat4(1) ! return M.getMat3() ! LookAt = createFunctionComponent(_lookat, "mat3 (vec3 pos, vec3 target)") --- 31,44 ---- from component import createFunctionComponent from cgtypes import * + from sl import radians import scene ! def _lookat(pos=vec3(0), target=vec3(0), up=vec3(0,0,1), roll=0.0): try: M = mat4().lookAt(pos, target, up) except: M = mat4(1) ! return M.getMat3()*mat3().rotation(radians(roll), vec3(0,0,1)) ! LookAt = createFunctionComponent(_lookat) # "mat3 (vec3 pos, vec3 target, vec3 up, double roll)") Index: targetcamera.py =================================================================== RCS file: /cvsroot/cgkit/cgkit2/cgkit/targetcamera.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** targetcamera.py 12 May 2005 12:58:29 -0000 1.7 --- targetcamera.py 21 Jul 2005 15:07:11 -0000 1.8 *************** *** 48,51 **** --- 48,53 ---- fov = 45.0, target = vec3(0,0,0), + roll = 0.0, + up = None, fstop = 0, focallength = 0, *************** *** 64,67 **** --- 66,81 ---- self.addSlot("target", self.target_slot) + # Roll + self.roll_slot = slots.DoubleSlot(roll) + self.addSlot("roll", self.roll_slot) + + # Up + self.up_slot = slots.Vec3Slot() + self.addSlot("up", self.up_slot) + if up==None: + self.up_slot.setValue(getScene().up) + else: + self.up_slot.setValue(vec3(up)) + self._lookat = lookat.LookAt() self._lookat.name = "TargetCamera_LookAt" *************** *** 69,72 **** --- 83,88 ---- self.pos_slot.connect(self._lookat.pos_slot) self.target_slot.connect(self._lookat.target_slot) + self.roll_slot.connect(self._lookat.roll_slot) + self.up_slot.connect(self._lookat.up_slot) # fstop *************** *** 108,111 **** --- 124,129 ---- exec slots.slotPropertyCode("fstop") exec slots.slotPropertyCode("focallength") + exec slots.slotPropertyCode("roll") + exec slots.slotPropertyCode("up") # "fov" property... |