+[](https://gitlab.com/veloren/veloren/commits/master)
+[](https://gitlab.com/veloren/veloren/commits/master)
+[](https://gitlab.com/veloren/veloren/blob/master/LICENSE)
+[](https://discord.gg/WEXSY9h)
+
## Welcome To Veloren!
Veloren is a multiplayer voxel RPG written in Rust. Veloren takes inspiration from games such as Cube World, Minecraft and Dwarf Fortress. The game is currently under heavy development, but is playable.
diff --git a/assets/voxygen b/assets/voxygen
index 25346c1ead..cff10b010d 160000
--- a/assets/voxygen
+++ b/assets/voxygen
@@ -1 +1 @@
-Subproject commit 25346c1ead7d03b11f7f4403332f2288824c6ca9
+Subproject commit cff10b010db25ce9af5edbdfb5ef0af889dd741a
diff --git a/chat-cli/.gitignore b/chat-cli/.gitignore
deleted file mode 100644
index 6197682122..0000000000
--- a/chat-cli/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target
-/assets
-**/*.rs.bk.rar
-Cargo.lock
diff --git a/chat-cli/src/main.rs b/chat-cli/src/main.rs
index 12d3c67773..411e4367f9 100644
--- a/chat-cli/src/main.rs
+++ b/chat-cli/src/main.rs
@@ -1,10 +1,7 @@
-use std::time::Duration;
+use client::{Client, Event, Input};
+use common::{clock::Clock, comp};
use log::info;
-use client::{Input, Client, Event};
-use common::{
- comp,
- clock::Clock,
-};
+use std::time::Duration;
const FPS: u64 = 60;
@@ -18,8 +15,8 @@ fn main() {
let mut clock = Clock::new();
// Create client
- let mut client = Client::new(([127, 0, 0, 1], 59003), 300)
- .expect("Failed to create client instance");
+ let mut client =
+ Client::new(([127, 0, 0, 1], 59003), 300).expect("Failed to create client instance");
client.register(comp::Player::new("test".to_string()));
@@ -31,7 +28,7 @@ fn main() {
Err(err) => {
println!("Error: {:?}", err);
break;
- },
+ }
};
for event in events {
diff --git a/client/.gitignore b/client/.gitignore
deleted file mode 100644
index 693699042b..0000000000
--- a/client/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-**/*.rs.bk
-Cargo.lock
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 6efe76ab0b..305cf38823 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -249,9 +249,18 @@ impl Client {
ServerMsg::Ping => self.postbox.send_message(ClientMsg::Pong),
ServerMsg::Pong => {}
ServerMsg::Chat(msg) => frontend_events.push(Event::Chat(msg)),
- ServerMsg::SetPlayerEntity(uid) => self.entity = self.state.ecs().entity_from_uid(uid).unwrap(), // TODO: Don't unwrap here!
- ServerMsg::EcsSync(sync_package) => self.state.ecs_mut().sync_with_package(sync_package),
- ServerMsg::EntityPhysics { entity, pos, vel, dir } => match self.state.ecs().entity_from_uid(entity) {
+ ServerMsg::SetPlayerEntity(uid) => {
+ self.entity = self.state.ecs().entity_from_uid(uid).unwrap()
+ } // TODO: Don't unwrap here!
+ ServerMsg::EcsSync(sync_package) => {
+ self.state.ecs_mut().sync_with_package(sync_package)
+ }
+ ServerMsg::EntityPhysics {
+ entity,
+ pos,
+ vel,
+ dir,
+ } => match self.state.ecs().entity_from_uid(entity) {
Some(entity) => {
self.state.write_component(entity, pos);
self.state.write_component(entity, vel);
@@ -259,7 +268,10 @@ impl Client {
}
None => {}
},
- ServerMsg::EntityAnimation { entity, animation_history } => match self.state.ecs().entity_from_uid(entity) {
+ ServerMsg::EntityAnimation {
+ entity,
+ animation_history,
+ } => match self.state.ecs().entity_from_uid(entity) {
Some(entity) => {
self.state.write_component(entity, animation_history);
}
diff --git a/common/.gitignore b/common/.gitignore
deleted file mode 100644
index 693699042b..0000000000
--- a/common/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-**/*.rs.bk
-Cargo.lock
diff --git a/common/src/assets/mod.rs b/common/src/assets/mod.rs
index 141a9c6cf1..c5e2ea2eec 100644
--- a/common/src/assets/mod.rs
+++ b/common/src/assets/mod.rs
@@ -1,8 +1,8 @@
use std::env;
use std::fs;
+use std::fs::File;
use std::io;
use std::io::prelude::*;
-use std::fs::File;
fn try_load(name: &str) -> Option {
+ let ao_scale = 1.0;
+ let dark = col * (1.0 - ao_scale);
+
+ if ao[0] + ao[2] < ao[1] + ao[3] {
+ Quad::new(
+ vcons(origin + unit_y, norm, Rgb::lerp(dark, col, ao[3])),
+ vcons(origin, norm, Rgb::lerp(dark, col, ao[0])),
+ vcons(origin + unit_x, norm, Rgb::lerp(dark, col, ao[1])),
+ vcons(origin + unit_x + unit_y, norm, Rgb::lerp(dark, col, ao[2])),
+ )
+ } else {
+ Quad::new(
+ vcons(origin, norm, Rgb::lerp(dark, col, ao[0])),
+ vcons(origin + unit_x, norm, Rgb::lerp(dark, col, ao[1])),
+ vcons(origin + unit_x + unit_y, norm, Rgb::lerp(dark, col, ao[2])),
+ vcons(origin + unit_y, norm, Rgb::lerp(dark, col, ao[3])),
+ )
+ }
+}
+
+pub fn push_vox_verts<
+ V: ReadVol,
+ P: Pipeline,
+ F: Fn(Vec3 ,
+ vol: &V,
+ pos: Vec3 {
- pub fn new(
- a: P::Vertex,
- b: P::Vertex,
- c: P::Vertex,
- ) -> Self {
+ pub fn new(a: P::Vertex, b: P::Vertex, c: P::Vertex) -> Self {
Self { a, b, c }
}
}
@@ -93,12 +89,7 @@ pub struct Quad {
- pub fn new(
- a: P::Vertex,
- b: P::Vertex,
- c: P::Vertex,
- d: P::Vertex,
- ) -> Self {
+ pub fn new(a: P::Vertex, b: P::Vertex, c: P::Vertex, d: P::Vertex) -> Self {
Self { a, b, c, d }
}
}
diff --git a/voxygen/src/render/mod.rs b/voxygen/src/render/mod.rs
index 17edd052a4..a8cd2936c7 100644
--- a/voxygen/src/render/mod.rs
+++ b/voxygen/src/render/mod.rs
@@ -9,33 +9,19 @@ mod util;
// Reexports
pub use self::{
consts::Consts,
- mesh::{Mesh, Tri, Quad},
+ mesh::{Mesh, Quad, Tri},
model::Model,
- texture::Texture,
- renderer::{Renderer, TgtColorFmt, TgtDepthFmt},
pipelines::{
- Globals,
- figure::{
- FigurePipeline,
- Locals as FigureLocals,
- BoneData as FigureBoneData,
- },
- skybox::{
- create_mesh as create_skybox_mesh,
- SkyboxPipeline,
- Locals as SkyboxLocals,
- },
- terrain::{
- TerrainPipeline,
- Locals as TerrainLocals,
- },
+ figure::{BoneData as FigureBoneData, FigurePipeline, Locals as FigureLocals},
+ skybox::{create_mesh as create_skybox_mesh, Locals as SkyboxLocals, SkyboxPipeline},
+ terrain::{Locals as TerrainLocals, TerrainPipeline},
ui::{
- create_quad as create_ui_quad,
- create_tri as create_ui_tri,
- Mode as UiMode,
- UiPipeline,
+ create_quad as create_ui_quad, create_tri as create_ui_tri, Mode as UiMode, UiPipeline,
},
+ Globals,
},
+ renderer::{Renderer, TgtColorFmt, TgtDepthFmt},
+ texture::Texture,
};
#[cfg(feature = "gl")]
@@ -64,8 +50,5 @@ pub enum RenderError {
/// - `SkyboxPipeline`
/// - `FigurePipeline`
pub trait Pipeline {
- type Vertex:
- Clone +
- gfx::traits::Pod +
- gfx::pso::buffer::Structure {
- pub fn new(
- factory: &mut gfx_backend::Factory,
- mesh: &Mesh ,
- ) -> Self {
+ pub fn new(factory: &mut gfx_backend::Factory, mesh: &Mesh ) -> Self {
Self {
vbuf: factory.create_vertex_buffer(mesh.vertices()),
slice: gfx::Slice {
diff --git a/voxygen/src/render/pipelines/figure.rs b/voxygen/src/render/pipelines/figure.rs
index 92d9d20480..e7fc4436bb 100644
--- a/voxygen/src/render/pipelines/figure.rs
+++ b/voxygen/src/render/pipelines/figure.rs
@@ -1,25 +1,20 @@
// Library
use gfx::{
self,
+ gfx_constant_struct_meta,
// Macros
gfx_defines,
- gfx_vertex_struct_meta,
- gfx_constant_struct_meta,
gfx_impl_struct_meta,
gfx_pipeline,
gfx_pipeline_inner,
+ gfx_vertex_struct_meta,
};
use vek::*;
// Local
use super::{
+ super::{util::arr_to_mat, Pipeline, TgtColorFmt, TgtDepthFmt},
Globals,
- super::{
- Pipeline,
- TgtColorFmt,
- TgtDepthFmt,
- util::arr_to_mat,
- },
};
gfx_defines! {
diff --git a/voxygen/src/render/pipelines/mod.rs b/voxygen/src/render/pipelines/mod.rs
index 6de0d417ef..2b4b8ba7d9 100644
--- a/voxygen/src/render/pipelines/mod.rs
+++ b/voxygen/src/render/pipelines/mod.rs
@@ -6,9 +6,9 @@ pub mod ui;
// Library
use gfx::{
self,
+ gfx_constant_struct_meta,
// Macros
gfx_defines,
- gfx_constant_struct_meta,
gfx_impl_struct_meta,
};
use vek::*;
diff --git a/voxygen/src/render/pipelines/skybox.rs b/voxygen/src/render/pipelines/skybox.rs
index 25e94dab0b..55ad42ecdd 100644
--- a/voxygen/src/render/pipelines/skybox.rs
+++ b/voxygen/src/render/pipelines/skybox.rs
@@ -1,25 +1,19 @@
// Library
use gfx::{
self,
+ gfx_constant_struct_meta,
// Macros
gfx_defines,
- gfx_vertex_struct_meta,
- gfx_constant_struct_meta,
gfx_impl_struct_meta,
gfx_pipeline,
gfx_pipeline_inner,
+ gfx_vertex_struct_meta,
};
// Local
use super::{
+ super::{Mesh, Pipeline, Quad, TgtColorFmt, TgtDepthFmt},
Globals,
- super::{
- Pipeline,
- TgtColorFmt,
- TgtDepthFmt,
- Mesh,
- Quad,
- },
};
gfx_defines! {
diff --git a/voxygen/src/render/pipelines/terrain.rs b/voxygen/src/render/pipelines/terrain.rs
index dd1e7bcf74..e687afa18c 100644
--- a/voxygen/src/render/pipelines/terrain.rs
+++ b/voxygen/src/render/pipelines/terrain.rs
@@ -1,24 +1,20 @@
// Library
use gfx::{
self,
+ gfx_constant_struct_meta,
// Macros
gfx_defines,
- gfx_vertex_struct_meta,
- gfx_constant_struct_meta,
gfx_impl_struct_meta,
gfx_pipeline,
gfx_pipeline_inner,
+ gfx_vertex_struct_meta,
};
use vek::*;
// Local
use super::{
+ super::{Pipeline, TgtColorFmt, TgtDepthFmt},
Globals,
- super::{
- Pipeline,
- TgtColorFmt,
- TgtDepthFmt,
- },
};
gfx_defines! {
diff --git a/voxygen/src/render/pipelines/ui.rs b/voxygen/src/render/pipelines/ui.rs
index 0c2147c667..54bde26431 100644
--- a/voxygen/src/render/pipelines/ui.rs
+++ b/voxygen/src/render/pipelines/ui.rs
@@ -1,20 +1,14 @@
+use super::super::{Pipeline, Quad, TgtColorFmt, TgtDepthFmt, Tri};
use gfx::{
self,
// Macros
gfx_defines,
- gfx_vertex_struct_meta,
gfx_impl_struct_meta,
gfx_pipeline,
gfx_pipeline_inner,
+ gfx_vertex_struct_meta,
};
use vek::*;
-use super::super::{
- Pipeline,
- TgtColorFmt,
- TgtDepthFmt,
- Quad,
- Tri,
-};
gfx_defines! {
vertex Vertex {
@@ -65,20 +59,20 @@ impl Mode {
}
}
-pub fn create_quad(rect: Aabr ) -> Result ,
offset: [u16; 2],
size: [u16; 2],
- data: &[[u8; 4]]
+ data: &[[u8; 4]],
) -> Result<(), RenderError> {
- texture.update(
- &mut self.encoder,
- offset,
- size,
- data,
- )
+ texture.update(&mut self.encoder, offset, size, data)
}
/// Queue the rendering of the provided skybox model in the upcoming frame.
@@ -273,7 +254,12 @@ impl Renderer {
&self.ui_pipeline.pso,
&ui::pipe::Data {
vbuf: model.vbuf.clone(),
- scissor: gfx::Rect { x: min.x, y: min.y, w: max.x - min.x, h: max.y - min.y },
+ scissor: gfx::Rect {
+ x: min.x,
+ y: min.y,
+ w: max.x - min.x,
+ h: max.y - min.y,
+ },
tex: (tex.srv.clone(), tex.sampler.clone()),
tgt_color: self.tgt_color_view.clone(),
tgt_depth: self.tgt_depth_view.clone(),
@@ -298,7 +284,8 @@ fn create_pipeline<'a, P: gfx::pso::PipelineInit>(
.map_err(|err| RenderError::PipelineError(gfx::PipelineStateError::Program(err)))?;
Ok(GfxPipeline {
- pso: factory.create_pipeline_from_program(
+ pso: factory
+ .create_pipeline_from_program(
&program,
gfx::Primitive::TriangleList,
gfx::state::Rasterizer {
@@ -310,14 +297,17 @@ fn create_pipeline<'a, P: gfx::pso::PipelineInit>(
},
pipe,
)
- // Do some funky things to work around an oddity in gfx's error ownership rules
- .map_err(|err| RenderError::PipelineError(match err {
- gfx::PipelineStateError::Program(err) =>
- gfx::PipelineStateError::Program(err),
- gfx::PipelineStateError::DescriptorInit(err) =>
- gfx::PipelineStateError::DescriptorInit(err.into()),
- gfx::PipelineStateError::DeviceCreate(err) =>
- gfx::PipelineStateError::DeviceCreate(err),
- }))?,
+ // Do some funky things to work around an oddity in gfx's error ownership rules
+ .map_err(|err| {
+ RenderError::PipelineError(match err {
+ gfx::PipelineStateError::Program(err) => gfx::PipelineStateError::Program(err),
+ gfx::PipelineStateError::DescriptorInit(err) => {
+ gfx::PipelineStateError::DescriptorInit(err.into())
+ }
+ gfx::PipelineStateError::DeviceCreate(err) => {
+ gfx::PipelineStateError::DeviceCreate(err)
+ }
+ })
+ })?,
})
}
diff --git a/voxygen/src/render/texture.rs b/voxygen/src/render/texture.rs
index d9d166dd4c..1dacef8c29 100644
--- a/voxygen/src/render/texture.rs
+++ b/voxygen/src/render/texture.rs
@@ -2,29 +2,25 @@
use std::marker::PhantomData;
// Library
-use gfx::{
- self,
- traits::Factory,
-};
-use image::{
- DynamicImage,
- GenericImageView,
-};
+use gfx::{self, traits::Factory};
+use image::{DynamicImage, GenericImageView};
use vek::Vec2;
// Local
-use super::{
- RenderError,
- Pipeline,
- gfx_backend,
-};
+use super::{gfx_backend, Pipeline, RenderError};
type ShaderFormat = (gfx::format::R8_G8_B8_A8, gfx::format::Srgb);
/// Represents an image that has been uploaded to the GPU.
pub struct Texture ,
}
@@ -34,15 +30,16 @@ impl {
factory: &mut gfx_backend::Factory,
image: &DynamicImage,
) -> Result {
)
.map_err(|err| RenderError::CombinedError(gfx::CombinedError::Texture(err)))?;
- let srv =
- factory.view_texture_as_shader_resource:: {
mipmap: 0,
};
encoder
- .update_texture::<