Removed euclid dependency, while allowing for more math functions.

android-example/rust/Cargo.toml

@@ -19,10 +19,6 @@ gl = "0.14"
 jni = "0.13"
 log = "0.4"
 
-[dependencies.euclid]
-version = "0.20"
-features = []
-
 [dependencies.surfman]
 path = "../../surfman"
 features = ["sm-test"]

android-example/rust/src/lib.rs

@@ -7,7 +7,7 @@ use crate::threads::common::ResourceLoader;
 use crate::threads::App;
 
 use android_logger::Config;
-use euclid::default::Size2D;
+use surfman::geom::default::Size2D;
 use jni::objects::{GlobalRef, JByteBuffer, JClass, JObject, JValue};
 use jni::{JNIEnv, JavaVM};
 use log::Level;

surfman/Cargo.toml

@@ -34,10 +34,7 @@ lazy_static = "1"
 libc = "0.2"
 log = "0.4"
 parking_lot = "0.10.2"
-
-[dependencies.euclid]
-version = "0.20"
-features = []
+num-traits = "0.2"
 
 [dependencies.osmesa-sys]
 version = "0.1"

surfman/examples/chaos_game.rs

@@ -2,8 +2,8 @@
 //
 //! Demonstrates how to use `surfman` to draw to a window surface via the CPU.
 
-use euclid::default::Point2D;
 use rand::{self, Rng};
+use surfman::geom::default::Point2D;
 use surfman::{SurfaceAccess, SurfaceType};
 use winit::dpi::PhysicalSize;
 use winit::{DeviceEvent, Event, EventsLoop, KeyboardInput, VirtualKeyCode};

surfman/examples/offscreen.rs

@@ -6,14 +6,14 @@
 use crate::common::{ck, Buffer, FilesystemResourceLoader, Program, Shader, ShaderKind};
 
 use clap::{App, Arg};
-use euclid::default::Size2D;
 use gl;
 use gl::types::{GLchar, GLenum, GLint, GLuint, GLvoid};
 use png::{BitDepth, ColorType, Encoder};
 use std::fs::File;
 use std::mem;
 use std::path::Path;
 use std::slice;
+use surfman::geom::Size2D;
 use surfman::{Connection, ContextAttributeFlags, ContextAttributes, GLApi, GLVersion};
 use surfman::{SurfaceAccess, SurfaceType};
 

surfman/examples/threads.rs

@@ -4,10 +4,10 @@
 
 use self::common::{ck, Buffer, Program, ResourceLoader, Shader, ShaderKind};
 
-use euclid::default::{Point2D, Rect, Size2D, Vector2D};
 use gl::types::{GLchar, GLenum, GLint, GLuint, GLvoid};
 use std::sync::mpsc::{self, Receiver, Sender};
 use std::thread;
+use surfman::geom::default::{Point2D, Rect, Size2D, Vector2D};
 use surfman::{declare_surfman, SurfaceAccess, SurfaceTexture, SurfaceType};
 use surfman::{Adapter, Connection, Context, ContextDescriptor, Device, GLApi, Surface};
 

surfman/src/connection.rs

@@ -5,7 +5,7 @@
 use crate::Error;
 use crate::GLApi;
 
-use euclid::default::Size2D;
+use crate::geom::default::Size2D;
 
 use std::os::raw::c_void;
 

surfman/src/device.rs

@@ -3,9 +3,9 @@
 //! The abstract interface that all devices conform to.
 
 use super::connection::Connection as ConnectionInterface;
+use crate::geom::default::Size2D;
 use crate::gl::types::{GLenum, GLuint};
 use crate::{ContextAttributes, ContextID, Error, GLApi, SurfaceAccess, SurfaceInfo, SurfaceType};
-use euclid::default::Size2D;
 
 use std::os::raw::c_void;