glm94/terrain_generator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added more math functionsto the vectors and matrix classes.

Browse Source
This commit is contained in:
glm94
2020-07-15 11:50:20 -05:00
parent 813c1f531f
commit a4aa0c628f
3 changed files with 67 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.py
+27 -52
View File
@@ -61,7 +61,7 @@ def mouse_start(event):
ui.canvas.old_coords = event.x, event.y
def mouse_end(event):
x, y = event.x - ui.width / 2, event.y - ui.height / 2#ui.canvas.old_coords[0] - event.x, ui.canvas.old_coords[1] - event.y
x, y = event.x - ui.width / 2, event.y - ui.height / 2
if x < 0:
ui.thetax -= .01
else:
@@ -73,11 +73,9 @@ def mouse_end(event):
ui.thetaz += .01
draw_scene()
#ui.theta += x / ui.width
def draw_scene():
ui.canvas.delete("all")
#ui.theta += .01 # scaling factor
aspect_ratio = ui.height / ui.width
projection_matrix = Matrix4x4.get_projection_matrix(fov, aspect_ratio, near_plane, far_plane)
@@ -86,79 +84,56 @@ def draw_scene():
rotation_matrix_x = Matrix4x4.get_x_rotation_matrix(ui.thetax)
#translation = Matrix4x4.get_translation_matrix(Vector3d(0, 0, 16))
translation = Matrix4x4.get_translation_matrix(Vector3d(0, 0, 3))
#world_matrix = Matrix4x4.get_identity_matrix()
#world_matrix = rotation_matrix_z.multiply_matrix(rotation_matrix_x)
#world_matrix = world_matrix.multiply_matrix(translation)
world_matrix = Matrix4x4.get_identity_matrix()
world_matrix = rotation_matrix_z.multiply_matrix(rotation_matrix_x)
world_matrix = world_matrix.multiply_matrix(translation)
triangles = []
for tri in tris:
# Rotate on the z-axis
row1 = rotation_matrix_z.multiply_3d(tri.row1)
row2 = rotation_matrix_z.multiply_3d(tri.row2)
row3 = rotation_matrix_z.multiply_3d(tri.row3)
row1 = world_matrix.multiply_3d(tri[0])
row2 = world_matrix.multiply_3d(tri[1])
row3 = world_matrix.multiply_3d(tri[2])
rotated_y = Matrix3x3(row1, row2, row3)
# Rotate on the x-axis
row1 = rotation_matrix_x.multiply_3d(rotated_y.row1)
row2 = rotation_matrix_x.multiply_3d(rotated_y.row2)
row3 = rotation_matrix_x.multiply_3d(rotated_y.row3)
transformed = Matrix3x3(row1, row2, row3)
rotated_x = Matrix3x3(row1, row2, row3)
# The offset into the screen
translated = copy.copy(rotated_x)
translated.row1.z += 3.0
translated.row2.z += 3.0
translated.row3.z += 3.0
# Use cross-product to get the surface normal (a Vector3d)
x = translated.row2.x - translated.row1.x
y = translated.row2.y - translated.row1.y
z = translated.row2.z - translated.row1.z
line1 = Vector3d(x, y, z)
x = translated.row3.x - translated.row1.x
y = translated.row3.y - translated.row1.y
z = translated.row3.z - translated.row1.z
line2 = Vector3d(x, y, z)
line1 = transformed.row2.subtract_3d(transformed.row1)
line2 = transformed.row3.subtract_3d(transformed.row1)
normal = line1.cross_product(line2)
# Now we normalize the normal
length = math.sqrt(normal.x * normal.x + normal.y * normal.y + normal.z * normal.z)
normal.x /= length
normal.y /= length
normal.z /= length
normal = normal.get_normalized_form()
# Do we display this triangle?
if normal.dot_product(translated.row1) < 0.0:
if normal.dot_product(transformed.row1) < 0.0:
# Lighting
light = Vector3d(0, 0, -1) # Shining at the player.
length = math.sqrt(light.x * light.x + light.y * light.y + light.z * light.z)
light.x /= length
light.y /= length
light.z /= length
light = light.get_normalized_form()
dot_product = normal.dot_product(light)
r = abs(int(255 * dot_product))
# Scale into view
row1 = projection_matrix.multiply_3d(translated.row1)
row2 = projection_matrix.multiply_3d(translated.row2)
row3 = projection_matrix.multiply_3d(translated.row3)
row1 = projection_matrix.multiply_3d(transformed.row1)
row2 = projection_matrix.multiply_3d(transformed.row2)
row3 = projection_matrix.multiply_3d(transformed.row3)
projected = Matrix3x3(row1, row2, row3)
projected.row1.x += 1
projected.row1.y += 1
projected.row2.x += 1
projected.row2.y += 1
projected.row3.x += 1
projected.row3.y += 1
projected.row1 = projected.row1.divide_3d(1)
projected.row2 = projected.row2.divide_3d(1)
projected.row3 = projected.row3.divide_3d(1)
offset = Vector3d(1, 1, 0)
projected.row1 = projected.row1.add_3d(offset)
projected.row2 = projected.row2.add_3d(offset)
projected.row3 = projected.row3.add_3d(offset)
projected.row1.x *= .5 * ui.width
projected.row1.y *= .5 * ui.height
projected.row2.x *= .5 * ui.width