X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=main.rs;h=2632712ce8083dc979e662ece34516738b81bd19;hb=0f22f5d5ef2021900d86402703b927006bde1935;hp=d1582dc288c86ab54c6320a4fcde1363e43e22d4;hpb=d435684b264419ec4d8fa5770ce7a15207a67c70;p=mandelwow.git

diff --git a/main.rs b/main.rs
index d1582dc..2632712 100644
--- a/main.rs
+++ b/main.rs
@@ -3,9 +3,7 @@ extern crate cgmath;
 extern crate glium;
 extern crate glutin;
 extern crate image;
-#[cfg(not(target_os = "emscripten"))]
 extern crate libxm;
-#[cfg(not(target_os = "emscripten"))]
 extern crate sdl2;
 
 //use cgmath::prelude::*;
@@ -20,10 +18,6 @@ use std::os::raw::{c_int, c_void};
 mod bounding_box;
 mod cube;
 mod mandelwow;
-#[cfg(not(target_os = "emscripten"))]
-mod sound;
-#[cfg(target_os = "emscripten")]
-#[path = "sound_emscripten.rs"]
 mod sound;
 mod support;
 
@@ -35,6 +29,15 @@ fn screenshot(display : &glium::Display) {
     image.save(&mut output, image::ImageFormat::PNG).unwrap();
 }
 
+fn gl_info(display : &glium::Display) {
+    let version = *display.get_opengl_version();
+    let api = match version {
+        glium::Version(glium::Api::Gl, _, _) => "OpenGL",
+        glium::Version(glium::Api::GlEs, _, _) => "OpenGL ES"
+    };
+    println!("{} context verson: {}", api, display.get_opengl_version_string());
+}
+
 #[allow(non_camel_case_types)]
 type em_callback_func = unsafe extern fn();
 extern {
@@ -63,7 +66,7 @@ fn main() {
     let _soundplayer = sound::start();
 
     let display = glutin::WindowBuilder::new()
-        .with_dimensions(300, 300)
+        .with_dimensions(600, 600)
         //.with_fullscreen(glutin::get_primary_monitor())
         .with_depth_buffer(24)
         .with_vsync()
@@ -71,12 +74,7 @@ fn main() {
         .build_glium()
         .unwrap();
 
-    let version = *display.get_opengl_version();
-    let api = match version {
-        glium::Version(glium::Api::Gl, _, _) => "OpenGL",
-        glium::Version(glium::Api::GlEs, _, _) => "OpenGL ES"
-    };
-    println!("{} context verson: {}", api, display.get_opengl_version_string());
+    gl_info(&display);
 
     let mandelwow_program = mandelwow::program(&display);
     let bounding_box_program = bounding_box::solid_fill_program(&display);