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

ui: API change, made a UiPosition enum #774

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
patreon: fedorgames
github: not-fl3
patreon: fedorgames
github: not-fl3
118 changes: 59 additions & 59 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
on: [push, pull_request]

name: CI

jobs:
build:
name: Cross-compile
runs-on: ${{ matrix.config.os }}
strategy:
fail-fast: false
matrix:
config:
- { os: ubuntu-latest, target: 'x86_64-unknown-linux-gnu' }
- { os: ubuntu-latest, target: 'x86_64-pc-windows-gnu' }
- { os: ubuntu-latest, target: 'wasm32-unknown-unknown' }
- { os: macos-latest, target: 'x86_64-apple-darwin' }
- { os: windows-latest, target: 'x86_64-pc-windows-msvc' }
include:
- os: ubuntu-latest
packages: libx11-dev libxi-dev libgl1-mesa-dev gcc-mingw-w64 libasound2-dev

steps:
- uses: actions/checkout@v2
- name: Install packages (Linux)
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get -yq --no-install-suggests --no-install-recommends install ${{ matrix.packages }}
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.config.target }}
override: true
- name: Workaround MinGW issue # https://github.com/rust-lang/rust/issues/47048
if: runner.os == 'Linux' && matrix.config.target == 'x86_64-pc-windows-gnu'
run: |
sudo cp /usr/x86_64-w64-mingw32/lib/dllcrt2.o ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-pc-windows-gnu/lib/dllcrt2.o
sudo cp /usr/x86_64-w64-mingw32/lib/crt2.o ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-pc-windows-gnu/lib/crt2.o
echo "[target.x86_64-pc-windows-gnu]" >> ~/.cargo/config
echo "linker = \"/usr/bin/x86_64-w64-mingw32-gcc\"" >> ~/.cargo/config
- uses: actions-rs/cargo@v1
with:
command: build
args: --all-targets --target=${{ matrix.config.target }}
fmt:
name: cargo fmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- run: rustup component add rustfmt
- uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
on: [push, pull_request]
name: CI
jobs:
build:
name: Cross-compile
runs-on: ${{ matrix.config.os }}
strategy:
fail-fast: false
matrix:
config:
- { os: ubuntu-latest, target: 'x86_64-unknown-linux-gnu' }
- { os: ubuntu-latest, target: 'x86_64-pc-windows-gnu' }
- { os: ubuntu-latest, target: 'wasm32-unknown-unknown' }
- { os: macos-latest, target: 'x86_64-apple-darwin' }
- { os: windows-latest, target: 'x86_64-pc-windows-msvc' }
include:
- os: ubuntu-latest
packages: libx11-dev libxi-dev libgl1-mesa-dev gcc-mingw-w64 libasound2-dev
steps:
- uses: actions/checkout@v2
- name: Install packages (Linux)
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get -yq --no-install-suggests --no-install-recommends install ${{ matrix.packages }}
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.config.target }}
override: true
- name: Workaround MinGW issue # https://github.com/rust-lang/rust/issues/47048
if: runner.os == 'Linux' && matrix.config.target == 'x86_64-pc-windows-gnu'
run: |
sudo cp /usr/x86_64-w64-mingw32/lib/dllcrt2.o ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-pc-windows-gnu/lib/dllcrt2.o
sudo cp /usr/x86_64-w64-mingw32/lib/crt2.o ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-pc-windows-gnu/lib/crt2.o
echo "[target.x86_64-pc-windows-gnu]" >> ~/.cargo/config
echo "linker = \"/usr/bin/x86_64-w64-mingw32-gcc\"" >> ~/.cargo/config
- uses: actions-rs/cargo@v1
with:
command: build
args: --all-targets --target=${{ matrix.config.target }}
fmt:
name: cargo fmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- run: rustup component add rustfmt
- uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/target
**/*.rs.bk
Cargo.lock
/target
**/*.rs.bk
Cargo.lock
110 changes: 55 additions & 55 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
[package]
name = "macroquad"
version = "0.4.11"
authors = ["not-fl3 <[email protected]>"]
edition = "2021"
homepage = "https://github.com/not-fl3/macroquad"
repository = "https://github.com/not-fl3/macroquad"
description = """
Simple and easy to use graphics library
"""
readme="README.md"
license = "MIT OR Apache-2.0"

[features]
audio = ["quad-snd"]
log-rs = ["log"]
glam-serde = ["glam/serde"]
default = []

[package.metadata.android]
assets = "examples/"

[profile.dev.package."*"]
opt-level = 3

[package.metadata.docs.rs]
all-features = true

[dependencies]
miniquad = { version = "=0.4.5", features = ["log-impl"] }
quad-rand = "0.2.1"
glam = {version = "0.27", features = ["scalar-math"] }
image = { version = "0.24", default-features = false, features = ["png", "tga"] }
macroquad_macro = { version = "0.1.8", path = "macroquad_macro" }
fontdue = "0.7"
backtrace = { version = "0.3.60", optional = true, default-features = false, features = [ "std", "libbacktrace" ] }
log = { version = "0.4", optional = true }
quad-snd = { version = "0.2", optional = true }
slotmap = "1.0"

[dev-dependencies]
macroquad-particles = { path = "./particles" }
macroquad-tiled = { path = "./tiled" }
macroquad-profiler = { path = "./profiler" }
macroquad-platformer = { path = "./physics-platformer" }

# workaround to fix the examples
# this allows to use macroquad-particles in examples without two versions of macroquad
[patch.crates-io]
macroquad = { path = './' }

#quad-snd = {path = '../quad-snd'}
#miniquad = { path = '../miniquad' }
#quad-gl = {path = './quad-gl'}

[package]
name = "macroquad"
version = "0.4.11"
authors = ["not-fl3 <[email protected]>"]
edition = "2021"
homepage = "https://github.com/not-fl3/macroquad"
repository = "https://github.com/not-fl3/macroquad"
description = """
Simple and easy to use graphics library
"""
readme="README.md"
license = "MIT OR Apache-2.0"
[features]
audio = ["quad-snd"]
log-rs = ["log"]
glam-serde = ["glam/serde"]
default = []
[package.metadata.android]
assets = "examples/"
[profile.dev.package."*"]
opt-level = 3
[package.metadata.docs.rs]
all-features = true
[dependencies]
miniquad = { version = "=0.4.5", features = ["log-impl"] }
quad-rand = "0.2.1"
glam = {version = "0.27", features = ["scalar-math"] }
image = { version = "0.24", default-features = false, features = ["png", "tga"] }
macroquad_macro = { version = "0.1.8", path = "macroquad_macro" }
fontdue = "0.7"
backtrace = { version = "0.3.60", optional = true, default-features = false, features = [ "std", "libbacktrace" ] }
log = { version = "0.4", optional = true }
quad-snd = { version = "0.2", optional = true }
slotmap = "1.0"
[dev-dependencies]
macroquad-particles = { path = "./particles" }
macroquad-tiled = { path = "./tiled" }
macroquad-profiler = { path = "./profiler" }
macroquad-platformer = { path = "./physics-platformer" }
# workaround to fix the examples
# this allows to use macroquad-particles in examples without two versions of macroquad
[patch.crates-io]
macroquad = { path = './' }
#quad-snd = {path = '../quad-snd'}
#miniquad = { path = '../miniquad' }
#quad-gl = {path = './quad-gl'}
Loading