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

crayon_init #1289

Open
wants to merge 71 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
7ac5451
t
alanpoon Jun 30, 2018
5572d1e
Merge branch 'master' of https://github.com/alanpoon/conrod
alanpoon Feb 13, 2019
0fea787
t
alanpoon Feb 19, 2019
137411b
c
alanpoon Feb 20, 2019
a2b835a
tft
alanpoon Feb 22, 2019
d0a6677
added events
alanpoon Feb 26, 2019
cb4b008
t
alanpoon Mar 1, 2019
aa03549
added tools for crayon
alanpoon Mar 3, 2019
3bddb30
remove find_folder
alanpoon Mar 6, 2019
a063322
add azure-pipelines.yml
alanpoon Mar 10, 2019
8508276
c1
alanpoon Mar 10, 2019
bd57431
fix cargo build
alanpoon Mar 10, 2019
aecd416
wasm
alanpoon Mar 10, 2019
10d3c5f
t
alanpoon Mar 10, 2019
4a96b08
t2
alanpoon Mar 10, 2019
ddd91be
t3
alanpoon Mar 10, 2019
9122163
t4
alanpoon Mar 11, 2019
7d1e381
t5
alanpoon Mar 11, 2019
5c7369c
t6
Mar 12, 2019
de13cce
t7
alanpoon Mar 12, 2019
3d998c8
t8
Mar 13, 2019
3a7de3e
updated webpack
Mar 13, 2019
325287a
updated to latest
alanpoon Mar 13, 2019
3a22d29
added status badge
alanpoon Mar 13, 2019
21a7b68
fix webpack version script
alanpoon Mar 13, 2019
bfb4603
t
alanpoon Apr 10, 2019
12af141
fixed windows error
Apr 10, 2019
104eb2a
added some fonts to crayon
Apr 12, 2019
85afdb3
t
alanpoon Apr 13, 2019
dc4416d
Merge branch 'master' of https://github.com/alanpoon/conrod
alanpoon Apr 13, 2019
093953f
before PrimitiveKind::Text for crayon
alanpoon Apr 13, 2019
26c30c7
zz
alanpoon Apr 14, 2019
25564a2
fixed textrender
Apr 16, 2019
8587fed
fixed text rendered
Apr 16, 2019
6eac281
Merge branch 'master' of https://github.com/alanpoon/conrod
Apr 16, 2019
b30d2d6
merge primitivetext
Apr 16, 2019
a0d88c7
merge
Apr 16, 2019
8fe2b88
before fixing uniform mode
Apr 17, 2019
9bc55bf
mode stuck
Apr 17, 2019
22219f9
added chars
alanpoon Apr 17, 2019
19e13a7
attributes 3 requires int
alanpoon Apr 24, 2019
1f2b0dd
t1
alanpoon Apr 25, 2019
2ef39e3
render text
alanpoon Apr 30, 2019
c8bd912
xargo
alanpoon May 2, 2019
875d860
some changes to polygon
alanpoon May 9, 2019
e53fc3a
spacebar
alanpoon May 30, 2019
3d78edc
revert back
alanpoon May 30, 2019
081528d
remove println!
alanpoon Jun 1, 2019
1aaa7f3
try cache
alanpoon Jun 9, 2019
015248d
kcache
alanpoon Jun 9, 2019
d32e1bc
kcache2
alanpoon Jun 9, 2019
38bebac
install xargo
Jun 10, 2019
f0010f0
merge with piston
alanpoon Jun 15, 2019
eac9de4
added crayon to 0.65
alanpoon Jun 15, 2019
0a2a33f
y
alanpoon Jun 19, 2019
92ba6c5
prevents inherent conrod clear color
alanpoon Jun 21, 2019
0f9b6b2
use instant
alanpoon Jun 26, 2019
a9fa917
change glyph to RGBA8
alanpoon Jun 30, 2019
bdcc461
clean up
alanpoon Jun 30, 2019
b57f67e
update gitignore
alanpoon Jun 30, 2019
6214de0
Merge branch 'crayon' of https://github.com/alanpoon/conrod into crayon
alanpoon Jun 30, 2019
435fcdf
crayon_init
alanpoon Jun 30, 2019
e3ecc92
fix merge conflict
alanpoon Jul 2, 2019
45d9a1f
fix conflict
alanpoon Jul 2, 2019
4538ae1
remove package-lock.json from git
alanpoon Jul 2, 2019
245e12c
added instruction on instruction of installing crayon-cli
alanpoon Jul 2, 2019
a9202e8
git
alanpoon Jul 5, 2019
c615d22
fix instant in conrod_core
alanpoon Jul 5, 2019
0994e78
push with asset
alanpoon Jul 8, 2019
cd52b9d
ignore travis
alanpoon Aug 7, 2019
2b9e6c3
added npm run serve
alanpoon Aug 9, 2019
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@ target/
/.rust/
rusti.sh
/examples/**/target

Cargo.lock
*/**/dist
*/**/node_modules
backends/conrod_crayon/tools/wasm-template/package-lock.json
.travis.yml
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ members = [
"backends/conrod_glium",
"backends/conrod_piston",
"backends/conrod_vulkano",
"backends/conrod_crayon",
]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Conrod [![Build Status](https://travis-ci.org/PistonDevelopers/conrod.svg?branch=master)](https://travis-ci.org/PistonDevelopers/conrod) [![Crates.io](https://img.shields.io/crates/l/conrod_core.svg)](https://github.com/PistonDevelopers/conrod/blob/master/LICENSE)

[![Build Status](https://dev.azure.com/K1720055F/conrod/_apis/build/status/alanpoon.conrod%20(1)?branchName=master)](https://dev.azure.com/K1720055F/conrod/_build/latest?definitionId=3&branchName=master)
An easy-to-use, 2D GUI library written entirely in Rust.

Guide
Expand Down
Binary file added assets/crayon/assets/Oswald-Heavy.ttf
Binary file not shown.
10 changes: 10 additions & 0 deletions assets/crayon/assets/Oswald-Heavy.ttf.meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name = 'Oswald-Heavy.ttf'
uuid = 'b148e135-5e22-451b-92f6-3671e60ac865'

[[resources]]
type = 'Bytes'
name = 'Oswald-Heavy.ttf'
uuid = '26aa066c-5983-4da8-884c-4ac7bf9c49f6'

[params]
type = 'Bytes'
118 changes: 118 additions & 0 deletions assets/crayon/assets/cornell_box.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
# The original Cornell Box in OBJ format.
# Note that the real box is not a perfect cube, so
# the faces are imperfect in this data set.
#
# Created by Guedis Cardenas and Morgan McGuire at Williams College, 2011
# Released into the Public Domain.
#
# http://graphics.cs.williams.edu/data
# http://www.graphics.cornell.edu/online/box/data.html
#

## Object floor
v -1.01 0.00 0.99
v 1.00 0.00 0.99
v 1.00 0.00 -1.04
v -0.99 0.00 -1.04

g floor
usemtl floor
f -4 -3 -2 -1

## Object backwall
v -0.99 0.00 -1.04
v 1.00 0.00 -1.04
v 1.00 1.99 -1.04
v -1.02 1.99 -1.04

## Object shortBox
g shortBox
usemtl shortBox

# Top Face
v 0.53 0.60 0.75
v 0.70 0.60 0.17
v 0.13 0.60 0.00
v -0.05 0.60 0.57
f -4 -3 -2 -1

# Left Face
v -0.05 0.00 0.57
v -0.05 0.60 0.57
v 0.13 0.60 0.00
v 0.13 0.00 0.00
f -4 -3 -2 -1

# Front Face
v 0.53 0.00 0.75
v 0.53 0.60 0.75
v -0.05 0.60 0.57
v -0.05 0.00 0.57
f -4 -3 -2 -1

# Right Face
v 0.70 0.00 0.17
v 0.70 0.60 0.17
v 0.53 0.60 0.75
v 0.53 0.00 0.75
f -4 -3 -2 -1

# Back Face
v 0.13 0.00 0.00
v 0.13 0.60 0.00
v 0.70 0.60 0.17
v 0.70 0.00 0.17
f -4 -3 -2 -1

# Bottom Face
v 0.53 0.00 0.75
v 0.70 0.00 0.17
v 0.13 0.00 0.00
v -0.05 0.00 0.57
f -12 -11 -10 -9

## Object tallBox
g tallBox
usemtl tallBox

# Top Face
v -0.53 1.20 0.09
v 0.04 1.20 -0.09
v -0.14 1.20 -0.67
v -0.71 1.20 -0.49
f -4 -3 -2 -1

# Left Face
v -0.53 0.00 0.09
v -0.53 1.20 0.09
v -0.71 1.20 -0.49
v -0.71 0.00 -0.49
f -4 -3 -2 -1

# Back Face
v -0.71 0.00 -0.49
v -0.71 1.20 -0.49
v -0.14 1.20 -0.67
v -0.14 0.00 -0.67
f -4 -3 -2 -1

# Right Face
v -0.14 0.00 -0.67
v -0.14 1.20 -0.67
v 0.04 1.20 -0.09
v 0.04 0.00 -0.09
f -4 -3 -2 -1

# Front Face
v 0.04 0.00 -0.09
v 0.04 1.20 -0.09
v -0.53 1.20 0.09
v -0.53 0.00 0.09
f -4 -3 -2 -1

# Bottom Face
v -0.53 0.00 0.09
v 0.04 0.00 -0.09
v -0.14 0.00 -0.67
v -0.71 0.00 -0.49
f -8 -7 -6 -5
31 changes: 31 additions & 0 deletions assets/crayon/assets/cornell_box.obj.meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name = 'cornell_box.obj'
uuid = '13b56f8c-7724-4313-a5ff-d870db23b243'

[[resources]]
type = 'Prefab'
name = 'cornell_box.obj'
uuid = '64cd2e4e-1949-4718-ad79-bec5f4cd5600'

[[resources]]
type = 'Mesh'
name = 'floor'
uuid = '6f0c4447-040f-47c2-8f48-bb8284df5678'

[[resources]]
type = 'Mesh'
name = 'shortBox'
uuid = 'd0cb0ac2-ac69-49c9-98cb-f5841751b3fd'

[[resources]]
type = 'Mesh'
name = 'tallBox'
uuid = 'e32f80df-6b59-46d9-b49e-4651aaf8a64e'

[params]
type = 'Transmission'

[params.mesh]
optimize = true
calculate_normals = true
calculate_tangents = false
calculate_texcoord = false
Binary file added assets/crayon/assets/crate.bmp
Binary file not shown.
15 changes: 15 additions & 0 deletions assets/crayon/assets/crate.bmp.meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name = 'crate.bmp'
uuid = '31ae371a-0b79-4eb2-a2bb-0bd527937e2d'

[[resources]]
type = 'Texture'
name = 'crate.bmp'
uuid = '2943b938-6a27-4730-a507-02a904f384d5'

[params]
type = 'Texture'
mipmap = true
alpha_premultiply = false
wrap = 'Clamp'
filter = 'Linear'
compression = 'HighQuality'
Binary file added assets/crayon/assets/music.mp3
Binary file not shown.
11 changes: 11 additions & 0 deletions assets/crayon/assets/music.mp3.meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name = 'music.mp3'
uuid = '6d4cf11e-a3f2-4e6f-8d1f-117c00a2622f'

[[resources]]
type = 'AudioClip'
name = 'music.mp3'
uuid = '4572a4b5-c9f1-46bd-8451-7f6fa535fae6'

[params]
type = 'Audio'
compression = 'HighQuality'
Binary file added assets/crayon/assets/sfx.ogg
Binary file not shown.
11 changes: 11 additions & 0 deletions assets/crayon/assets/sfx.ogg.meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name = 'sound_efx.ogg'
uuid = 'c8c0425f-79ed-41bc-baf1-2c8b6df6b0e9'

[[resources]]
type = 'AudioClip'
name = 'sound_efx.ogg'
uuid = '427eb273-e774-46b8-b701-0ace1b7652ee'

[params]
type = 'Audio'
compression = 'HighQuality'
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added assets/crayon/resources/MANIFEST
Binary file not shown.
40 changes: 40 additions & 0 deletions assets/crayon/workspace.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[assets]
source = 'assets'
destination = 'resources'

[[assets.importers]]
type = 'Texture'
extensions = [
'.png',
'.jpg',
'.jpeg',
'.bmp',
'.tga',
'.psd', # Yes, we do supports .PSD files.
]

[[assets.importers]]
type = 'Transmission'
extensions = [
'.obj',
'.blend',
'.fbx',
'.gltf',
'.dae',
'.3ds',
]

[[assets.importers]]
type = 'Audio'
extensions = [
'.mp3',
'.wav',
'.ogg',
]

[[assets.importers]]
type = 'Bytes'
extensions = [
'.ttf',
'.otf',
]
10 changes: 10 additions & 0 deletions assets/fonts/NotoSans/NotoSans-BoldItalic.ttf.meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name = 'fonts/NotoSans/NotoSans-BoldItalic.ttf'
uuid = 'b0a1740a-bc68-48e5-9c26-cc17089f2675'

[[resources]]
type = 'Bytes'
name = 'fonts/NotoSans/NotoSans-BoldItalic.ttf'
uuid = '3b904684-995f-46e9-a6f4-567f284b82f3'

[params]
type = 'Bytes'
10 changes: 10 additions & 0 deletions assets/fonts/NotoSans/NotoSans-Italic.ttf.meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name = 'fonts/NotoSans/NotoSans-Italic.ttf'
uuid = 'd17c06ff-d2d5-443e-865a-a26bde79c4bf'

[[resources]]
type = 'Bytes'
name = 'fonts/NotoSans/NotoSans-Italic.ttf'
uuid = '8f9795bb-5c7d-4215-b38d-65ea3d784813'

[params]
type = 'Bytes'
Loading