alex/portability
1
0
Fork 0
mirror of https://github.com/italicsjenga/portability.git synced 2024-11-25 00:11:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix Makefile and build and update README

Browse source
This commit is contained in:
msiglreith 2018-01-02 17:39:02 +01:00
parent d270a36ba3
commit bcc11fac99
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -3,7 +3,7 @@ BINDING=target/vulkan.rs
NATIVE_DIR=target/native NATIVE_DIR=target/native
TARGET=$(NATIVE_DIR)/test TARGET=$(NATIVE_DIR)/test
OBJECTS=$(NATIVE_DIR)/test.o $(NATIVE_DIR)/window.o OBJECTS=$(NATIVE_DIR)/test.o $(NATIVE_DIR)/window.o
LIBRARY=target/debug/libportability.a LIBRARY=target/debug/libportability.so
CC=g++ CC=g++
CFLAGS=-std=c++11 -ggdb -O0 -I$(VULKAN_DIR) CFLAGS=-std=c++11 -ggdb -O0 -I$(VULKAN_DIR)
@ -20,7 +20,7 @@ $(BINDING): $(VULKAN_DIR)/vulkan/*.h
bindgen --no-layout-tests --rustfmt-bindings $(VULKAN_DIR)/vulkan/vulkan.h -o $(BINDING) bindgen --no-layout-tests --rustfmt-bindings $(VULKAN_DIR)/vulkan/vulkan.h -o $(BINDING)
$(LIBRARY): libportability/src/*.rs libportability-gfx/src/*.rs Cargo.toml $(wildcard Cargo.lock) $(LIBRARY): libportability/src/*.rs libportability-gfx/src/*.rs Cargo.toml $(wildcard Cargo.lock)
cargo build -p portability cargo build --manifest-path libportability/Cargo.toml --features vulkan
mkdir -p target/native mkdir -p target/native
$(NATIVE_DIR)/%.o: native/%.cpp $(DEPS) Makefile $(NATIVE_DIR)/%.o: native/%.cpp $(DEPS) Makefile

2
README.md
View file

@ -14,7 +14,7 @@ make
Build the Rust library (portability implementation): Build the Rust library (portability implementation):
``` ```
cargo build -p portability cargo build --manifest-path libportability/Cargo.toml --features <vulkan|dx12>
``` ```
Build the native example: Build the native example:

8
native/math.hpp
View file

@ -1,7 +1,9 @@
#pragma once #pragma once
const float M_PI = 3.1415926535897932; #include <cmath>
const float pi = 3.1415926535897932;
template<typename T> template<typename T>
class mat4_tl class mat4_tl
@ -85,7 +87,7 @@ template<typename T>
auto perspective(T fov, T aspect, T n, T f) -> mat4_tl<T> { auto perspective(T fov, T aspect, T n, T f) -> mat4_tl<T> {
assert(fov > 0); assert(aspect > 0); assert(fov > 0); assert(aspect > 0);
const T rad = fov*T(M_PI)/T(180); const T rad = fov*T(pi)/T(180);
const T a = T(1)/(std::tan(rad/T(2))); const T a = T(1)/(std::tan(rad/T(2)));
return mat4_tl<T>( return mat4_tl<T>(
@ -101,7 +103,7 @@ class vec3_tl
public: public:
union { union {
struct { T x, y, z; }; struct { T x, y, z; };
struct { T s, t, r; }; struct { T s, t, u; };
struct { T r, g, b; }; struct { T r, g, b; };
T data[3]; T data[3];
}; };