StrafesNET/strafe-client
5
Fork 4
Code Issues 2 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

validation error

Browse Source
This commit is contained in:
Quaternions 2024-05-04 16:18:56 -07:00
parent 5f1b162775
commit a354aefa8c
4 changed files with 289 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

495
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
Cargo.toml
View File

@ -21,8 +21,8 @@ strafesnet_bsp_loader = { version = "0.1.1", registry = "strafesnet" }
strafesnet_common = { version = "0.1.2", registry = "strafesnet" } strafesnet_common = { version = "0.1.2", registry = "strafesnet" }
strafesnet_deferred_loader = { version = "0.3.0", features = ["legacy"], registry = "strafesnet" } strafesnet_deferred_loader = { version = "0.3.0", features = ["legacy"], registry = "strafesnet" }
strafesnet_rbx_loader = { version = "0.3.0", registry = "strafesnet" } strafesnet_rbx_loader = { version = "0.3.0", registry = "strafesnet" }
wgpu = "0.19.0" wgpu = "0.20.0"
winit = "0.29.2" winit = "0.30.0"
#[profile.release] #[profile.release]
#lto = true #lto = true

4
src/graphics.rs
View File

@ -754,11 +754,13 @@ impl GraphicsState{
module:&shader, module:&shader,
entry_point:"vs_sky", entry_point:"vs_sky",
buffers:&[], buffers:&[],
compilation_options:wgpu::PipelineCompilationOptions::default(),
}, },
fragment:Some(wgpu::FragmentState{ fragment:Some(wgpu::FragmentState{
module:&shader, module:&shader,
entry_point:"fs_sky", entry_point:"fs_sky",
targets:&[Some(config.view_formats[0].into())], targets:&[Some(config.view_formats[0].into())],
compilation_options:wgpu::PipelineCompilationOptions::default(),
}), }),
primitive:wgpu::PrimitiveState{ primitive:wgpu::PrimitiveState{
front_face:wgpu::FrontFace::Cw, front_face:wgpu::FrontFace::Cw,
@ -785,11 +787,13 @@ impl GraphicsState{
step_mode:wgpu::VertexStepMode::Vertex, step_mode:wgpu::VertexStepMode::Vertex,
attributes:&wgpu::vertex_attr_array![0=>Float32x3,1=>Float32x2,2=>Float32x3,3=>Float32x4], attributes:&wgpu::vertex_attr_array![0=>Float32x3,1=>Float32x2,2=>Float32x3,3=>Float32x4],
}], }],
compilation_options:wgpu::PipelineCompilationOptions::default(),
}, },
fragment:Some(wgpu::FragmentState{ fragment:Some(wgpu::FragmentState{
module:&shader, module:&shader,
entry_point:"fs_entity_texture", entry_point:"fs_entity_texture",
targets:&[Some(config.view_formats[0].into())], targets:&[Some(config.view_formats[0].into())],
compilation_options:wgpu::PipelineCompilationOptions::default(),
}), }),
primitive:wgpu::PrimitiveState{ primitive:wgpu::PrimitiveState{
front_face:wgpu::FrontFace::Cw, front_face:wgpu::FrontFace::Cw,

6
src/setup.rs
View File

@ -25,14 +25,14 @@ struct SetupContextPartial1{
instance:wgpu::Instance, instance:wgpu::Instance,
} }
fn create_window(title:&str,event_loop:&winit::event_loop::EventLoop<()>)->Result<winit::window::Window,winit::error::OsError>{ fn create_window(title:&str,event_loop:&winit::event_loop::EventLoop<()>)->Result<winit::window::Window,winit::error::OsError>{
let mut builder = winit::window::WindowBuilder::new(); let mut attr=winit::window::WindowAttributes::default();
builder = builder.with_title(title); attr=attr.with_title(title);
#[cfg(windows_OFF)] // TODO #[cfg(windows_OFF)] // TODO
{ {
use winit::platform::windows::WindowBuilderExtWindows; use winit::platform::windows::WindowBuilderExtWindows;
builder=builder.with_no_redirection_bitmap(true); builder=builder.with_no_redirection_bitmap(true);
} }
builder.build(event_loop) event_loop.create_window(attr)
} }
fn create_instance()->SetupContextPartial1{ fn create_instance()->SetupContextPartial1{
let backends=wgpu::util::backend_bits_from_env().unwrap_or_else(wgpu::Backends::all); let backends=wgpu::util::backend_bits_from_env().unwrap_or_else(wgpu::Backends::all);