Fork: 0
cory / 3d_renderer
Browse code
fixed matrixes for camera, player and new_cube placement
master
1 parent a3731d6 commit 52426702cc43e00a431659b6eb0aeec19282b4ba
@cory cory authored on 25 Mar 2022
Patch
Unified Split
Showing 3 changed files
View
86
■■■■■
 functions.py
return[p1, p2]
 
 
# new functions
def generate_cam_matrix(rx_D: int, ry_D: int, rz_D: int, player_pos):
#rx = math.radians(rx_D)
rx = 0
ry = math.radians(rx_D)
rz = math.radians(rz_D)
 
rotation_matrix = numpy.array(
[[math.cos(ry)*math.cos(rz), math.sin(rx)*math.sin(ry)*math.cos(rz) - math.cos(rx)*math.sin(rz), math.cos(rx)*math.sin(ry)*math.cos(rz) + math.sin(rx)*math.sin(rz), 0],
[math.cos(ry)*math.sin(rz), math.sin(rx)*math.sin(ry)*math.sin(rz) + math.cos(rx)*math.cos(rz), math.cos(rx)*math.sin(ry)*math.sin(rz) - math.sin(rx)*math.sin(rz), 0],
[-math.sin(ry), math.sin(rx)*math.cos(ry), math.cos(rx)*math.cos(ry), 0],
[0, 0, 0, 1]]
)
def generate_cam_matrix(rx_d: int, ry_d: int, rz_d: int, player_pos):
rx = math.radians(rx_d)
ry = math.radians(ry_d)
rz = math.radians(rz_d)
 
x_rot = numpy.array([[1, 0, 0, 0],
[0, math.cos(rx), math.sin(rx), 0],
[0, -math.sin(rx), math.cos(rx), 0],
[0, 0, 0, 1]])
 
y_rot = numpy.array([[math.cos(ry), 0, -math.sin(ry), 0],
[0, 1, 0, 0],
[math.sin(ry), 0, math.cos(ry), 0],
[0, 0, 0, 1]])
 
z_rot = numpy.array([[math.cos(rz), math.sin(rz), 0, 0],
[-math.sin(rz), math.cos(rz), 0, 0],
[0, 0, 1, 0],
[0, 0, 0, 1]])
rotation_matrix = x_rot.dot(y_rot).dot(z_rot)
 
translation_matrix = numpy.array(
[[1, 0, 0, player_pos.x],
[0, 1, 0, player_pos.y],
[0, 0, 1, player_pos.z],
[0, 0, 0, 1]]
)
# todo
# make this thing
# generates a transformation matrix for the current camera
# should only be run once per frame (hopefully a performance improvement?)
# return translation_matrix.dot(rotation_matrix)
# return numpy.matmul(translation_matrix, rotation_matrix)
return numpy.matmul(translation_matrix, rotation_matrix)
# return numpy.multiply(translation_matrix, rotation_matrix)
return rotation_matrix.dot(translation_matrix)
 
 
def gen_inv_rot_matrix(rx_d, ry_d, rz_d):
rx = math.radians(-rx_d)
ry = math.radians(rx_d)
rz = math.radians(-rz_d - 90)
 
x_rot = numpy.array([[1, 0, 0, 0],
[0, math.cos(rx), math.sin(rx), 0],
[0, -math.sin(rx), math.cos(rx), 0],
[0, 0, 0, 1]])
 
y_rot = numpy.array([[math.cos(ry), 0, -math.sin(ry), 0],
[0, 1, 0, 0],
[math.sin(ry), 0, math.cos(ry), 0],
[0, 0, 0, 1]])
 
z_rot = numpy.array([[math.cos(rz), math.sin(rz), 0, 0],
[-math.sin(rz), math.cos(rz), 0, 0],
[0, 0, 1, 0],
[0, 0, 0, 1]])
return z_rot.dot(y_rot).dot(x_rot)
 
 
def draw_face(face: Face, cam_matrix: numpy.array, fp_dis):
if type(face) is TexturedFace:
View
24
■■■■■
 main.py
# screen with in units
scrWidth = 3.2
 
# player information
playerPos: Point3D = Point3D(0, 10, 0)
playerPos: Point3D = Point3D(0, 0, 0)
playerSpeed: Point3D = Point3D(0, 0, 0)
 
# todo implement these variables into the code
acc = 20 # units per second per second
currentTexture: int = 0
 
# create cubes
cubes: list[Cube] = []
for x in [[5, 0, 0]]: #[[-12, 3, 4], [2, 2, 2], [2, 0, 0], [0, 2, 0], [0, 0, 0], [6, -8, 4]]:
for x in [[-12, 3, 4], [2, 2, 2], [2, 0, 0], [0, 2, 0], [0, 0, 0], [6, -8, 4]]:
cubes.append(Cube(Point3D(x[0], x[1], x[2]), [Colour([255, 0, 0]) for x in range(6)], True, True))
 
# todo update or remove
# axes points
 
if grabbed:
# rotate camera if mouse moves
dZ, dX = pygame.mouse.get_rel()
rotX -= dX * sensitivity
rotZ += dZ * sensitivity
rotX += dX * sensitivity
rotZ -= dZ * sensitivity
 
# fix camera within movement bounds
rotZ = rotZ % 360
if rotX > 90:
keys = pygame.key.get_pressed()
 
# generate matrices
camMatrix = generate_cam_matrix(rotX, rotY, rotZ, playerPos)
invRotMatrix = gen_inv_rot_matrix(rotX, rotY, rotZ)
 
# __draw cubes__
# calculate 3d and project 3d point locations
for cube in cubes:
# whyyyy
# add faces for placeable cube
if placing:
# generate the position for the new cube ('ray cast' out of camera and do weird things)
newCubePos = Point3D._make([reverse_rotate([[blockDistance, 0, 0]], rotX, rotY, -rotZ + 90)[0]][0])
# newCubePos = Point3D._make([reverse_rotate([[blockDistance, 0, 0]], rotX, rotY, -rotZ + 90)[0]][0])
newCubePos = Point3D(blockDistance, 0, 0).apply_matrix(invRotMatrix)
# todo change this to a .applymatrix
newCubePos.inv_translate(playerPos)
newCubePos.snap()
newCubePos = newCubePos.inv_translate(playerPos)
newCubePos = newCubePos.snap()
 
# generate cube object with position of newCubePos
newCube = Cube(newCubePos, placingColours[currentTexture], True, keys[pygame.K_LCTRL])
# take faces out of cube object and never speak of it again
# ______draw all faces______
# apply camMatrix to allFaces
for face in allFaces:
for i, point in enumerate(face.points):
# face.points[i] = point.apply_matrix(camMatrix)
face.points[i] = Point3D._make(rotate(point.translate(playerPos), rotX, rotY, rotZ))
# apply the camera matrix to the points
face.points[i] = face.points[i].apply_matrix(camMatrix)
# fix points behind the camera
face.fix_points_behind_camera()
 
# sort the list of allFaces
# draw allFaces
i = 0
for i, face in enumerate(allFaces):
_2dPoints = [point.get_2d_point(FPDis).conv_coord(size, scale) for point in face.points]
# _2dPoints = [point.conv_coord(size, scale) for point in _2dPoints] # this seems really illegal
 
try:
if True: # face_angle([face.points[0], face.points[1], face.points[2]], FPDis, camDistance) > 90:
if face.hasFaces and len(face.points) > 2:
except ZeroDivisionError:
magnitude = 0
 
vectoredDirection = [x * magnitude for x in pressedKeys]
rotatedVector = rotate(vectoredDirection, 0, 0, -rotZ)
rotatedVector = rotate(vectoredDirection, 0, 0, rotZ)
 
playerSpeed = Point3D._make(
[(speed + ((acc / frameRate) * kPress)) * (1 - (((acc-1) / maxSpeed)/frameRate))
for speed, kPress in zip(playerSpeed.xyz(), rotatedVector)])
View
model.py