Changeset 270

Timestamp:

11/02/08 15:35:38 (2 months ago)

Author:

mihai.maruseac

Message:

ray picking de la eye coordinate catre punctul selectat si mai departe; am ascuns terenul si modelul si am schimbat perspectiva

Files:

• test/loadmodel.py (modified) (3 diffs)
• trunk/hfall/Engine/Render.py (modified) (1 diff)
• trunk/hfall/Matrix.py (modified) (3 diffs)
• trunk/hfall/UI/UI.py (modified) (4 diffs)
• trunk/hfall/Vector.py (modified) (2 diffs)

test/loadmodel.py

@@ -53 +53 @@
-        render.addLight(light1)
-        #This is an example of terrain rendering
-AddModel.add_model("models/machinegun/3dm-q3machinegun.3ds", [0, 10, 
+#AddModel.add_model("models/machinegun/3dm-q3machinegun.3ds", [0, 10, 1
-        terrain = Terrain.Terrain()
-        patch = Terrain.TerrainPatch(x_origin = -64)
@@ -68 +68 @@
-        terrain.addPatch(patch)#"""
-        terrain.Enable()
-
+#
-        #model = Test.TTest()
-        #render.testmodel = model
@@ -87 +87 @@
-        return "drawer"
-
--1.5
+0
-hfk.insert(drawer())
-hfk.insert(render)

trunk/hfall/Engine/Render.py

@@ -212 +212 @@
-            glPopMatrix()
-            
-
+#
-            #just to make it work
-

trunk/hfall/Matrix.py

@@ -3 +3 @@
-"""
-import math
+from pyglet.gl import *
-
-import Vector
@@ -326 +327 @@
-                    c._m[i][j] = s
-            return c
+        elif isinstance(other, Vector.Vector4):
+            v = Vector.Vector4()
+            for i in range(4):
+                s = 0
+                for j in range(4):
+                    s += self._m[i][j] * other[j]
+                v[i] = s
+            return v
-        else:
-            return Matrix4([self._m[0][0] * other,\
@@ -533 +542 @@
-               '|' + str(self._m[2][0]) + ' ' + str(self._m[2][1]) + ' ' + str(self._m[2][2]) + ' ' + str(self._m[2][3]) + '|\n' +\
-               '|' + str(self._m[3][0]) + ' ' + str(self._m[3][1]) + ' ' + str(self._m[3][2]) + ' ' + str(self._m[3][3]) + '|'
+
+    def asDouble(self):
+        m = (GLdouble*16)(*[])
+        m[0] = self._m[0][0]
+        m[1] = self._m[0][1]
+        m[2] = self._m[0][2]
+        m[3] = self._m[0][3]
+        m[4] = self._m[1][0]
+        m[5] = self._m[1][1]
+        m[6] = self._m[1][2]
+        m[7] = self._m[1][3]
+        m[8] = self._m[2][0]
+        m[9] = self._m[2][1]
+        m[10] = self._m[2][2]
+        m[11] = self._m[2][3]
+        m[12] = self._m[3][0]
+        m[13] = self._m[3][1]
+        m[14] = self._m[3][2]
+        m[15] = self._m[3][3]
+        return m

trunk/hfall/UI/UI.py

@@ -23 +23 @@
-import Mathbase
-from Console import Console
+from glcalls import *
+from View import *
-
-"""
@@ -52 +54 @@
-                game_get(symbol,modifiers)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if button == mouse.LEFT and modifiers & key.LCTRL:
-                mat_proj = (GLdouble * 16)()
-                mat_model = (GLdouble * 16)()
-                mat_view = (GLint* 4)()
-
-
-
+
+
+
+
+
+
+
+
+
-                world_x = (GLdouble * 1)()
-                world_y = (GLdouble * 1)()
@@ -66 +140 @@
-                world_y2 = (GLdouble * 1)()
-                world_z2 = (GLdouble * 1)()
-
+
+
-                     world_x,world_y,world_z) == GLU_FALSE:
-                        print "Error in UI.on_mouse_press - projection results" + \
-                              "are not valid"
-5
+1.0
-                     world_x2,world_y2,world_z2) == GLU_FALSE:
-                        print "Error in UI.on_mouse_press - projection results" + \
-                              "are not valid"
-                # Folosim ecuatiile parametrice ale dreptei in spatiu 
-
+
+
-                x1 = world_x[0] + factor * (world_x2[0]-world_x[0])
-                x2 = world_x[0] - factor * (world_x2[0]-world_x[0])
@@ -82 +158 @@
-                z1 = world_z[0] + factor * (world_z2[0]-world_z[0])
-                z2 = world_z[0] - factor * (world_z2[0]-world_z[0])
+                x = world_x[0]
+                y = world_y[0]
+                z = world_z[0]
+                xx = world_x2[0]
+                yy = world_y2[0]
+                zz = world_z2[0]
+                print x, y, z, xx, yy, zz, '<<---verifica-le'
-                
-
+
+
+
+
+
+
-                global_UI.refresh_world_coords(world_x[0],world_y[0],world_z[0])
-        

trunk/hfall/Vector.py

@@ -3 +3 @@
-"""
-import math
+from pyglet.gl import *
-
-class Vector2:
@@ -282 +283 @@
-               ' ' + str(self.z) +\
-               ' ' + str(self.w) + ']'
+
+    def asDouble(self):
+        m = (GLint*4)(*[])
+        m[0] = int(self.x)
+        m[1] = int(self.y)
+        m[2] = int(self.z)
+        m[3] = int(self.w)
+        return m