Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build errors related to #181 #184

Merged
merged 2 commits into from
Feb 5, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#![feature(box_syntax)]
#![feature(plugin)]

#![feature(collections, core, io, os, path, rustc_private, std_misc)]

#[plugin]
#[no_link]

Expand Down
7 changes: 3 additions & 4 deletions src/minecraft/block_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use std::num::UnsignedInt;
use array::*;
use chunk::{BiomeId, BlockState, Chunk};
use cube;
use device::draw::CommandBuffer;
use gfx::Device;
use minecraft::biome::Biomes;
use minecraft::data::BLOCK_STATES;
Expand All @@ -28,14 +27,14 @@ pub struct BlockStates {
texture: Texture
}

#[derive(PartialEq, Eq, Clone)]
#[derive(PartialEq, Eq, Clone, Copy)]
pub enum RandomOffset {
None,
XZ,
XYZ
}

#[derive(PartialEq, Eq, Clone)]
#[derive(PartialEq, Eq, Clone, Copy)]
pub enum Dir {
Down,
Up,
Expand Down Expand Up @@ -69,7 +68,7 @@ impl Dir {
}
}

#[derive(Clone)]
#[derive(Clone, Copy)]
pub enum PolymorphDecision {
// Stop and use this block state ID for the model.
PickBlockState(u16),
Expand Down
1 change: 0 additions & 1 deletion src/minecraft/nbt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use std::string::ToString;

use flate::{ inflate_bytes, inflate_bytes_zlib };
use serialize;
use serialize::Decodable;
use serialize::hex::ToHex;

use self::Nbt::*;
Expand Down
2 changes: 1 addition & 1 deletion src/shader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use device;
use device::draw::CommandBuffer;
use gfx;
use gfx::{ Device, DeviceHelper, ToSlice };
use gfx::render;
use vecmath::Matrix4;

static VERTEX: gfx::ShaderSource<'static> = shaders! {
Expand Down Expand Up @@ -99,6 +98,7 @@ impl Clone for Vertex {
}
}

#[derive(Copy)]
pub struct Buffer {
buf: gfx::BufferHandle<Vertex>,
batch: gfx::batch::RefBatch<ShaderParam>,
Expand Down