Refactor main.rs to use the new rendering features
This commit is contained in:
parent
91ce772e58
commit
f6a9d18c5c
1 changed files with 15 additions and 5 deletions
20
src/main.rs
20
src/main.rs
|
|
@ -1,13 +1,14 @@
|
||||||
mod camera;
|
mod camera;
|
||||||
mod ecs;
|
mod ecs;
|
||||||
mod model;
|
mod model;
|
||||||
|
mod gltf_loader;
|
||||||
mod render;
|
mod render;
|
||||||
mod time;
|
mod time;
|
||||||
mod ui;
|
mod ui;
|
||||||
|
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use camera::Camera;
|
use camera::Camera;
|
||||||
use ecs::{MeshHandle, Transform};
|
use ecs::{Transform};
|
||||||
use glam::{Quat, Vec3, EulerRot};
|
use glam::{Quat, Vec3, EulerRot};
|
||||||
use glium::backend::glutin::SimpleWindowBuilder;
|
use glium::backend::glutin::SimpleWindowBuilder;
|
||||||
use render::GliumRenderer;
|
use render::GliumRenderer;
|
||||||
|
|
@ -35,11 +36,20 @@ fn main() -> Result<()> {
|
||||||
let mut time = time::Time::new();
|
let mut time = time::Time::new();
|
||||||
|
|
||||||
let object_ent = {
|
let object_ent = {
|
||||||
let mesh = model::load_gltf("resources/models/monkey.gltf", &display)?;
|
let model_3d = gltf_loader::load_gltf("resources/models/tree.gltf", &display)?;
|
||||||
ecsr.spawn_mesh(mesh, Transform {
|
ecsr.spawn_mesh(model_3d, Transform {
|
||||||
translation: Vec3::ZERO,
|
translation: Vec3::new(0.0, -2.5, -5.0),
|
||||||
rotation: Quat::IDENTITY,
|
rotation: Quat::IDENTITY,
|
||||||
scale: Vec3::ONE,
|
scale: Vec3::new(0.01, 0.01, 0.01),
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
let ground_ent = {
|
||||||
|
let model_3d = gltf_loader::load_gltf("resources/models/plane.gltf", &display)?;
|
||||||
|
ecsr.spawn_mesh(model_3d, Transform {
|
||||||
|
translation: Vec3::new(0.0, -1.5, 0.0),
|
||||||
|
rotation: Quat::IDENTITY,
|
||||||
|
scale: Vec3::new(1.0, 1.0, 1.0),
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue