TDT4195/OpenGL_Intro
0
0
Fork 0
Code Issues Pull Requests 2 Releases Activity

typos and such

Browse Source
This commit is contained in:
Peder Bergebakken Sundt
2023-08-15 15:44:10 +02:00
parent 1b23564a66
commit 82ea75e6d3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -35,12 +35,12 @@ We want the following files and folders to be delivered in a ZIP file:
To automatically make an archive (`source.zip`) ready for uploading to blackboard:
* Make sure any extra assets or resources you have might have added are located in the `resources` folder
* Make sure any extra assets or resources you might have added are located in the `resources` folder
* Then run either:
* `create_code_archive_for_blackboard_LINUX.sh`
* `./create_code_archive_for_blackboard_LINUX.sh`
* `create_code_archive_for_blackboard_WINDOWS.bat`.
This script will explicitly ignore the `target` folder, and two files given as a handout for exercise 3, to save space:
This zip script will explicitly ignore the `target` folder, and the following two of the files given as a handout for exercise 3 (just to save space):
* `resources/helicopter.obj`
* `resources/lunarsurface.obj`

8
src/main.rs
View File

@@ -159,13 +159,13 @@ fn main() {
// The main rendering loop
let first_frame_time = std::time::Instant::now();
let mut prevous_frame_time = first_frame_time;
let mut previous_frame_time = first_frame_time;
loop {
// Compute time passed since the previous frame and since the start of the program
let now = std::time::Instant::now();
let elapsed = now.duration_since(first_frame_time).as_secs_f32();
let delta_time = now.duration_since(prevous_frame_time).as_secs_f32();
prevous_frame_time = now;
let delta_time = now.duration_since(previous_frame_time).as_secs_f32();
previous_frame_time = now;
// Handle resize events
if let Ok(mut new_size) = window_size.lock() {
@@ -201,7 +201,7 @@ fn main() {
// Handle mouse movement. delta contains the x and y movement of the mouse since last frame in pixels
if let Ok(mut delta) = mouse_delta.lock() {
// == // Optionally access the acumulated mouse movement between
// == // Optionally access the accumulated mouse movement between
// == // frames here with `delta.0` and `delta.1`
*delta = (0.0, 0.0); // reset when done