ya2
·
news
·
projects
·
code
·
about
Ya2
/
projects
/
pmachines.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a747111
)
dds and bam
author
Flavio Calva
<f.calva@gmail.com>
Thu, 10 Mar 2022 18:05:21 +0000
(19:05 +0100)
committer
Flavio Calva
<f.calva@gmail.com>
Thu, 10 Mar 2022 18:05:21 +0000
(19:05 +0100)
111 files changed:
.gitignore
patch
|
blob
|
blame
|
history
assets/blend/background/ao.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/background/ao_roughness_metal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/background/background.blend
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/background/base.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/background/bump.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/background/bump_frame.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/background/bump_pattern.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/background/metal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/background/normal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/background/roughness.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/basketball/ao.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/basketball/ao_metal_roughness.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/basketball/base.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/basketball/basketball.blend
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/basketball/bump.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/basketball/bump0.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/basketball/metal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/basketball/normal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/basketball/roughness.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/box/ao.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/box/ao_metal_roughness.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/box/base.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/box/box.blend
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/box/metal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/box/normal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/box/normal_bw.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/box/roughness.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/domino/ao.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/domino/ao_roughness_metal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/domino/base.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/domino/bump.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/domino/domino.blend
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/domino/metal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/domino/normal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/domino/roughness.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/shelf/ao.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/shelf/ao_roughness_metal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/shelf/base.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/shelf/metal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/shelf/normal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/shelf/roughness.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/shelf/shelf.blend
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/teeter_tooter/ao.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/teeter_tooter/ao_roughness_metal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/teeter_tooter/base.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/teeter_tooter/metal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/teeter_tooter/normal.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/teeter_tooter/roughness.png
[deleted file]
patch
|
blob
|
blame
|
history
assets/blend/teeter_tooter/teeter_tooter.blend
[deleted file]
patch
|
blob
|
blame
|
history
assets/models/blend/background/ao.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/background/ao_roughness_metal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/background/background.blend
[new file with mode: 0644]
patch
|
blob
assets/models/blend/background/base.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/background/bump.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/background/bump_frame.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/background/bump_pattern.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/background/metal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/background/normal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/background/roughness.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/basketball/ao.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/basketball/ao_metal_roughness.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/basketball/base.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/basketball/basketball.blend
[new file with mode: 0644]
patch
|
blob
assets/models/blend/basketball/bump.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/basketball/bump0.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/basketball/metal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/basketball/normal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/basketball/roughness.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/box/ao.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/box/ao_metal_roughness.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/box/base.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/box/box.blend
[new file with mode: 0644]
patch
|
blob
assets/models/blend/box/metal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/box/normal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/box/normal_bw.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/box/roughness.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/domino/ao.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/domino/ao_roughness_metal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/domino/base.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/domino/bump.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/domino/domino.blend
[new file with mode: 0644]
patch
|
blob
assets/models/blend/domino/metal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/domino/normal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/domino/roughness.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/shelf/ao.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/shelf/ao_roughness_metal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/shelf/base.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/shelf/metal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/shelf/normal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/shelf/roughness.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/shelf/shelf.blend
[new file with mode: 0644]
patch
|
blob
assets/models/blend/teeter_tooter/ao.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/teeter_tooter/ao_roughness_metal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/teeter_tooter/base.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/teeter_tooter/metal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/teeter_tooter/normal.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/teeter_tooter/roughness.png
[new file with mode: 0644]
patch
|
blob
assets/models/blend/teeter_tooter/teeter_tooter.blend
[new file with mode: 0644]
patch
|
blob
lib/build/models.py
patch
|
blob
|
blame
|
history
pmachines/app.py
patch
|
blob
|
blame
|
history
pmachines/items/background.py
patch
|
blob
|
blame
|
history
pmachines/items/basketball.py
patch
|
blob
|
blame
|
history
pmachines/items/box.py
patch
|
blob
|
blame
|
history
pmachines/items/domino.py
patch
|
blob
|
blame
|
history
pmachines/items/shelf.py
patch
|
blob
|
blame
|
history
pmachines/items/teetertooter.py
patch
|
blob
|
blame
|
history
pmachines/menu.py
patch
|
blob
|
blame
|
history
pmachines/scene.py
patch
|
blob
|
blame
|
history
prj.org
patch
|
blob
|
blame
|
history
setup.py
patch
|
blob
|
blame
|
history
diff --git
a/.gitignore
b/.gitignore
index 3dd2fb5720b960fa6be144166e62d529b7cbb1aa..01b2a17467c3d309fc24e7552696437b87931f43 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-5,9
+5,10
@@
TAGS
*.mo
*.pyc
*.blend1
*.mo
*.pyc
*.blend1
+/hash_cache.txt
/assets/bld_version.txt
/options.ini
/assets/bld_version.txt
/options.ini
-/assets/gltf/
+/assets/
models/
gltf/
/build/
/dist/
/assets/locale/
/build/
/dist/
/assets/locale/
diff --git
a/assets/blend/background/ao.png
b/assets/blend/background/ao.png
deleted file mode 100644
(file)
index
a3a90b5
..0000000
Binary files a/assets/blend/background/ao.png and /dev/null differ
diff --git
a/assets/blend/background/ao_roughness_metal.png
b/assets/blend/background/ao_roughness_metal.png
deleted file mode 100644
(file)
index
d191abf
..0000000
Binary files a/assets/blend/background/ao_roughness_metal.png and /dev/null differ
diff --git
a/assets/blend/background/background.blend
b/assets/blend/background/background.blend
deleted file mode 100644
(file)
index
4808dd2
..0000000
Binary files a/assets/blend/background/background.blend and /dev/null differ
diff --git
a/assets/blend/background/base.png
b/assets/blend/background/base.png
deleted file mode 100644
(file)
index
b6f8c50
..0000000
Binary files a/assets/blend/background/base.png and /dev/null differ
diff --git
a/assets/blend/background/bump.png
b/assets/blend/background/bump.png
deleted file mode 100644
(file)
index
8d88791
..0000000
Binary files a/assets/blend/background/bump.png and /dev/null differ
diff --git
a/assets/blend/background/bump_frame.png
b/assets/blend/background/bump_frame.png
deleted file mode 100644
(file)
index
162db11
..0000000
Binary files a/assets/blend/background/bump_frame.png and /dev/null differ
diff --git
a/assets/blend/background/bump_pattern.png
b/assets/blend/background/bump_pattern.png
deleted file mode 100644
(file)
index
5dfc360
..0000000
Binary files a/assets/blend/background/bump_pattern.png and /dev/null differ
diff --git
a/assets/blend/background/metal.png
b/assets/blend/background/metal.png
deleted file mode 100644
(file)
index
1258f72
..0000000
Binary files a/assets/blend/background/metal.png and /dev/null differ
diff --git
a/assets/blend/background/normal.png
b/assets/blend/background/normal.png
deleted file mode 100644
(file)
index
597185d
..0000000
Binary files a/assets/blend/background/normal.png and /dev/null differ
diff --git
a/assets/blend/background/roughness.png
b/assets/blend/background/roughness.png
deleted file mode 100644
(file)
index
324ea17
..0000000
Binary files a/assets/blend/background/roughness.png and /dev/null differ
diff --git
a/assets/blend/basketball/ao.png
b/assets/blend/basketball/ao.png
deleted file mode 100644
(file)
index
abf18fa
..0000000
Binary files a/assets/blend/basketball/ao.png and /dev/null differ
diff --git
a/assets/blend/basketball/ao_metal_roughness.png
b/assets/blend/basketball/ao_metal_roughness.png
deleted file mode 100644
(file)
index
d386caa
..0000000
Binary files a/assets/blend/basketball/ao_metal_roughness.png and /dev/null differ
diff --git
a/assets/blend/basketball/base.png
b/assets/blend/basketball/base.png
deleted file mode 100644
(file)
index
b690bf3
..0000000
Binary files a/assets/blend/basketball/base.png and /dev/null differ
diff --git
a/assets/blend/basketball/basketball.blend
b/assets/blend/basketball/basketball.blend
deleted file mode 100644
(file)
index
66b9f8f
..0000000
Binary files a/assets/blend/basketball/basketball.blend and /dev/null differ
diff --git
a/assets/blend/basketball/bump.png
b/assets/blend/basketball/bump.png
deleted file mode 100644
(file)
index
93b60af
..0000000
Binary files a/assets/blend/basketball/bump.png and /dev/null differ
diff --git
a/assets/blend/basketball/bump0.png
b/assets/blend/basketball/bump0.png
deleted file mode 100644
(file)
index
4cda44f
..0000000
Binary files a/assets/blend/basketball/bump0.png and /dev/null differ
diff --git
a/assets/blend/basketball/metal.png
b/assets/blend/basketball/metal.png
deleted file mode 100644
(file)
index
7a6e027
..0000000
Binary files a/assets/blend/basketball/metal.png and /dev/null differ
diff --git
a/assets/blend/basketball/normal.png
b/assets/blend/basketball/normal.png
deleted file mode 100644
(file)
index
11d4a10
..0000000
Binary files a/assets/blend/basketball/normal.png and /dev/null differ
diff --git
a/assets/blend/basketball/roughness.png
b/assets/blend/basketball/roughness.png
deleted file mode 100644
(file)
index
1f020e0
..0000000
Binary files a/assets/blend/basketball/roughness.png and /dev/null differ
diff --git
a/assets/blend/box/ao.png
b/assets/blend/box/ao.png
deleted file mode 100644
(file)
index
9bc6c25
..0000000
Binary files a/assets/blend/box/ao.png and /dev/null differ
diff --git
a/assets/blend/box/ao_metal_roughness.png
b/assets/blend/box/ao_metal_roughness.png
deleted file mode 100644
(file)
index
e916d6a
..0000000
Binary files a/assets/blend/box/ao_metal_roughness.png and /dev/null differ
diff --git
a/assets/blend/box/base.png
b/assets/blend/box/base.png
deleted file mode 100644
(file)
index
96a3d92
..0000000
Binary files a/assets/blend/box/base.png and /dev/null differ
diff --git
a/assets/blend/box/box.blend
b/assets/blend/box/box.blend
deleted file mode 100644
(file)
index
dfadde5
..0000000
Binary files a/assets/blend/box/box.blend and /dev/null differ
diff --git
a/assets/blend/box/metal.png
b/assets/blend/box/metal.png
deleted file mode 100644
(file)
index
5014be4
..0000000
Binary files a/assets/blend/box/metal.png and /dev/null differ
diff --git
a/assets/blend/box/normal.png
b/assets/blend/box/normal.png
deleted file mode 100644
(file)
index
db7ce4b
..0000000
Binary files a/assets/blend/box/normal.png and /dev/null differ
diff --git
a/assets/blend/box/normal_bw.png
b/assets/blend/box/normal_bw.png
deleted file mode 100644
(file)
index
b810f11
..0000000
Binary files a/assets/blend/box/normal_bw.png and /dev/null differ
diff --git
a/assets/blend/box/roughness.png
b/assets/blend/box/roughness.png
deleted file mode 100644
(file)
index
d6fa31f
..0000000
Binary files a/assets/blend/box/roughness.png and /dev/null differ
diff --git
a/assets/blend/domino/ao.png
b/assets/blend/domino/ao.png
deleted file mode 100644
(file)
index
ec98fd3
..0000000
Binary files a/assets/blend/domino/ao.png and /dev/null differ
diff --git
a/assets/blend/domino/ao_roughness_metal.png
b/assets/blend/domino/ao_roughness_metal.png
deleted file mode 100644
(file)
index
711707a
..0000000
Binary files a/assets/blend/domino/ao_roughness_metal.png and /dev/null differ
diff --git
a/assets/blend/domino/base.png
b/assets/blend/domino/base.png
deleted file mode 100644
(file)
index
af872fe
..0000000
Binary files a/assets/blend/domino/base.png and /dev/null differ
diff --git
a/assets/blend/domino/bump.png
b/assets/blend/domino/bump.png
deleted file mode 100644
(file)
index
6fe2e18
..0000000
Binary files a/assets/blend/domino/bump.png and /dev/null differ
diff --git
a/assets/blend/domino/domino.blend
b/assets/blend/domino/domino.blend
deleted file mode 100644
(file)
index
dddf290
..0000000
Binary files a/assets/blend/domino/domino.blend and /dev/null differ
diff --git
a/assets/blend/domino/metal.png
b/assets/blend/domino/metal.png
deleted file mode 100644
(file)
index
332971c
..0000000
Binary files a/assets/blend/domino/metal.png and /dev/null differ
diff --git
a/assets/blend/domino/normal.png
b/assets/blend/domino/normal.png
deleted file mode 100644
(file)
index
4d6fa7c
..0000000
Binary files a/assets/blend/domino/normal.png and /dev/null differ
diff --git
a/assets/blend/domino/roughness.png
b/assets/blend/domino/roughness.png
deleted file mode 100644
(file)
index
d39979b
..0000000
Binary files a/assets/blend/domino/roughness.png and /dev/null differ
diff --git
a/assets/blend/shelf/ao.png
b/assets/blend/shelf/ao.png
deleted file mode 100644
(file)
index
6bfe717
..0000000
Binary files a/assets/blend/shelf/ao.png and /dev/null differ
diff --git
a/assets/blend/shelf/ao_roughness_metal.png
b/assets/blend/shelf/ao_roughness_metal.png
deleted file mode 100644
(file)
index
559acf6
..0000000
Binary files a/assets/blend/shelf/ao_roughness_metal.png and /dev/null differ
diff --git
a/assets/blend/shelf/base.png
b/assets/blend/shelf/base.png
deleted file mode 100644
(file)
index
37e9b22
..0000000
Binary files a/assets/blend/shelf/base.png and /dev/null differ
diff --git
a/assets/blend/shelf/metal.png
b/assets/blend/shelf/metal.png
deleted file mode 100644
(file)
index
44a32e8
..0000000
Binary files a/assets/blend/shelf/metal.png and /dev/null differ
diff --git
a/assets/blend/shelf/normal.png
b/assets/blend/shelf/normal.png
deleted file mode 100644
(file)
index
e93077e
..0000000
Binary files a/assets/blend/shelf/normal.png and /dev/null differ
diff --git
a/assets/blend/shelf/roughness.png
b/assets/blend/shelf/roughness.png
deleted file mode 100644
(file)
index
ae7b321
..0000000
Binary files a/assets/blend/shelf/roughness.png and /dev/null differ
diff --git
a/assets/blend/shelf/shelf.blend
b/assets/blend/shelf/shelf.blend
deleted file mode 100644
(file)
index
a97716c
..0000000
Binary files a/assets/blend/shelf/shelf.blend and /dev/null differ
diff --git
a/assets/blend/teeter_tooter/ao.png
b/assets/blend/teeter_tooter/ao.png
deleted file mode 100644
(file)
index
b0dca71
..0000000
Binary files a/assets/blend/teeter_tooter/ao.png and /dev/null differ
diff --git
a/assets/blend/teeter_tooter/ao_roughness_metal.png
b/assets/blend/teeter_tooter/ao_roughness_metal.png
deleted file mode 100644
(file)
index
33167e5
..0000000
Binary files a/assets/blend/teeter_tooter/ao_roughness_metal.png and /dev/null differ
diff --git
a/assets/blend/teeter_tooter/base.png
b/assets/blend/teeter_tooter/base.png
deleted file mode 100644
(file)
index
fd3c84e
..0000000
Binary files a/assets/blend/teeter_tooter/base.png and /dev/null differ
diff --git
a/assets/blend/teeter_tooter/metal.png
b/assets/blend/teeter_tooter/metal.png
deleted file mode 100644
(file)
index
3667673
..0000000
Binary files a/assets/blend/teeter_tooter/metal.png and /dev/null differ
diff --git
a/assets/blend/teeter_tooter/normal.png
b/assets/blend/teeter_tooter/normal.png
deleted file mode 100644
(file)
index
8ac4afd
..0000000
Binary files a/assets/blend/teeter_tooter/normal.png and /dev/null differ
diff --git
a/assets/blend/teeter_tooter/roughness.png
b/assets/blend/teeter_tooter/roughness.png
deleted file mode 100644
(file)
index
3e7d7de
..0000000
Binary files a/assets/blend/teeter_tooter/roughness.png and /dev/null differ
diff --git
a/assets/blend/teeter_tooter/teeter_tooter.blend
b/assets/blend/teeter_tooter/teeter_tooter.blend
deleted file mode 100644
(file)
index
d64532f
..0000000
Binary files a/assets/blend/teeter_tooter/teeter_tooter.blend and /dev/null differ
diff --git a/assets/models/blend/background/ao.png
b/assets/models/blend/background/ao.png
new file mode 100644
(file)
index 0000000..
a3a90b5
Binary files /dev/null and b/assets/models/blend/background/ao.png differ
diff --git a/assets/models/blend/background/ao_roughness_metal.png
b/assets/models/blend/background/ao_roughness_metal.png
new file mode 100644
(file)
index 0000000..
d191abf
Binary files /dev/null and b/assets/models/blend/background/ao_roughness_metal.png differ
diff --git a/assets/models/blend/background/background.blend
b/assets/models/blend/background/background.blend
new file mode 100644
(file)
index 0000000..
4808dd2
Binary files /dev/null and b/assets/models/blend/background/background.blend differ
diff --git a/assets/models/blend/background/base.png
b/assets/models/blend/background/base.png
new file mode 100644
(file)
index 0000000..
b6f8c50
Binary files /dev/null and b/assets/models/blend/background/base.png differ
diff --git a/assets/models/blend/background/bump.png
b/assets/models/blend/background/bump.png
new file mode 100644
(file)
index 0000000..
8d88791
Binary files /dev/null and b/assets/models/blend/background/bump.png differ
diff --git a/assets/models/blend/background/bump_frame.png
b/assets/models/blend/background/bump_frame.png
new file mode 100644
(file)
index 0000000..
162db11
Binary files /dev/null and b/assets/models/blend/background/bump_frame.png differ
diff --git a/assets/models/blend/background/bump_pattern.png
b/assets/models/blend/background/bump_pattern.png
new file mode 100644
(file)
index 0000000..
5dfc360
Binary files /dev/null and b/assets/models/blend/background/bump_pattern.png differ
diff --git a/assets/models/blend/background/metal.png
b/assets/models/blend/background/metal.png
new file mode 100644
(file)
index 0000000..
1258f72
Binary files /dev/null and b/assets/models/blend/background/metal.png differ
diff --git a/assets/models/blend/background/normal.png
b/assets/models/blend/background/normal.png
new file mode 100644
(file)
index 0000000..
597185d
Binary files /dev/null and b/assets/models/blend/background/normal.png differ
diff --git a/assets/models/blend/background/roughness.png
b/assets/models/blend/background/roughness.png
new file mode 100644
(file)
index 0000000..
324ea17
Binary files /dev/null and b/assets/models/blend/background/roughness.png differ
diff --git a/assets/models/blend/basketball/ao.png
b/assets/models/blend/basketball/ao.png
new file mode 100644
(file)
index 0000000..
abf18fa
Binary files /dev/null and b/assets/models/blend/basketball/ao.png differ
diff --git a/assets/models/blend/basketball/ao_metal_roughness.png
b/assets/models/blend/basketball/ao_metal_roughness.png
new file mode 100644
(file)
index 0000000..
d386caa
Binary files /dev/null and b/assets/models/blend/basketball/ao_metal_roughness.png differ
diff --git a/assets/models/blend/basketball/base.png
b/assets/models/blend/basketball/base.png
new file mode 100644
(file)
index 0000000..
b690bf3
Binary files /dev/null and b/assets/models/blend/basketball/base.png differ
diff --git a/assets/models/blend/basketball/basketball.blend
b/assets/models/blend/basketball/basketball.blend
new file mode 100644
(file)
index 0000000..
66b9f8f
Binary files /dev/null and b/assets/models/blend/basketball/basketball.blend differ
diff --git a/assets/models/blend/basketball/bump.png
b/assets/models/blend/basketball/bump.png
new file mode 100644
(file)
index 0000000..
93b60af
Binary files /dev/null and b/assets/models/blend/basketball/bump.png differ
diff --git a/assets/models/blend/basketball/bump0.png
b/assets/models/blend/basketball/bump0.png
new file mode 100644
(file)
index 0000000..
4cda44f
Binary files /dev/null and b/assets/models/blend/basketball/bump0.png differ
diff --git a/assets/models/blend/basketball/metal.png
b/assets/models/blend/basketball/metal.png
new file mode 100644
(file)
index 0000000..
7a6e027
Binary files /dev/null and b/assets/models/blend/basketball/metal.png differ
diff --git a/assets/models/blend/basketball/normal.png
b/assets/models/blend/basketball/normal.png
new file mode 100644
(file)
index 0000000..
11d4a10
Binary files /dev/null and b/assets/models/blend/basketball/normal.png differ
diff --git a/assets/models/blend/basketball/roughness.png
b/assets/models/blend/basketball/roughness.png
new file mode 100644
(file)
index 0000000..
1f020e0
Binary files /dev/null and b/assets/models/blend/basketball/roughness.png differ
diff --git a/assets/models/blend/box/ao.png
b/assets/models/blend/box/ao.png
new file mode 100644
(file)
index 0000000..
9bc6c25
Binary files /dev/null and b/assets/models/blend/box/ao.png differ
diff --git a/assets/models/blend/box/ao_metal_roughness.png
b/assets/models/blend/box/ao_metal_roughness.png
new file mode 100644
(file)
index 0000000..
e916d6a
Binary files /dev/null and b/assets/models/blend/box/ao_metal_roughness.png differ
diff --git a/assets/models/blend/box/base.png
b/assets/models/blend/box/base.png
new file mode 100644
(file)
index 0000000..
96a3d92
Binary files /dev/null and b/assets/models/blend/box/base.png differ
diff --git a/assets/models/blend/box/box.blend
b/assets/models/blend/box/box.blend
new file mode 100644
(file)
index 0000000..
dfadde5
Binary files /dev/null and b/assets/models/blend/box/box.blend differ
diff --git a/assets/models/blend/box/metal.png
b/assets/models/blend/box/metal.png
new file mode 100644
(file)
index 0000000..
5014be4
Binary files /dev/null and b/assets/models/blend/box/metal.png differ
diff --git a/assets/models/blend/box/normal.png
b/assets/models/blend/box/normal.png
new file mode 100644
(file)
index 0000000..
db7ce4b
Binary files /dev/null and b/assets/models/blend/box/normal.png differ
diff --git a/assets/models/blend/box/normal_bw.png
b/assets/models/blend/box/normal_bw.png
new file mode 100644
(file)
index 0000000..
b810f11
Binary files /dev/null and b/assets/models/blend/box/normal_bw.png differ
diff --git a/assets/models/blend/box/roughness.png
b/assets/models/blend/box/roughness.png
new file mode 100644
(file)
index 0000000..
d6fa31f
Binary files /dev/null and b/assets/models/blend/box/roughness.png differ
diff --git a/assets/models/blend/domino/ao.png
b/assets/models/blend/domino/ao.png
new file mode 100644
(file)
index 0000000..
ec98fd3
Binary files /dev/null and b/assets/models/blend/domino/ao.png differ
diff --git a/assets/models/blend/domino/ao_roughness_metal.png
b/assets/models/blend/domino/ao_roughness_metal.png
new file mode 100644
(file)
index 0000000..
711707a
Binary files /dev/null and b/assets/models/blend/domino/ao_roughness_metal.png differ
diff --git a/assets/models/blend/domino/base.png
b/assets/models/blend/domino/base.png
new file mode 100644
(file)
index 0000000..
af872fe
Binary files /dev/null and b/assets/models/blend/domino/base.png differ
diff --git a/assets/models/blend/domino/bump.png
b/assets/models/blend/domino/bump.png
new file mode 100644
(file)
index 0000000..
6fe2e18
Binary files /dev/null and b/assets/models/blend/domino/bump.png differ
diff --git a/assets/models/blend/domino/domino.blend
b/assets/models/blend/domino/domino.blend
new file mode 100644
(file)
index 0000000..
dddf290
Binary files /dev/null and b/assets/models/blend/domino/domino.blend differ
diff --git a/assets/models/blend/domino/metal.png
b/assets/models/blend/domino/metal.png
new file mode 100644
(file)
index 0000000..
332971c
Binary files /dev/null and b/assets/models/blend/domino/metal.png differ
diff --git a/assets/models/blend/domino/normal.png
b/assets/models/blend/domino/normal.png
new file mode 100644
(file)
index 0000000..
4d6fa7c
Binary files /dev/null and b/assets/models/blend/domino/normal.png differ
diff --git a/assets/models/blend/domino/roughness.png
b/assets/models/blend/domino/roughness.png
new file mode 100644
(file)
index 0000000..
d39979b
Binary files /dev/null and b/assets/models/blend/domino/roughness.png differ
diff --git a/assets/models/blend/shelf/ao.png
b/assets/models/blend/shelf/ao.png
new file mode 100644
(file)
index 0000000..
6bfe717
Binary files /dev/null and b/assets/models/blend/shelf/ao.png differ
diff --git a/assets/models/blend/shelf/ao_roughness_metal.png
b/assets/models/blend/shelf/ao_roughness_metal.png
new file mode 100644
(file)
index 0000000..
559acf6
Binary files /dev/null and b/assets/models/blend/shelf/ao_roughness_metal.png differ
diff --git a/assets/models/blend/shelf/base.png
b/assets/models/blend/shelf/base.png
new file mode 100644
(file)
index 0000000..
37e9b22
Binary files /dev/null and b/assets/models/blend/shelf/base.png differ
diff --git a/assets/models/blend/shelf/metal.png
b/assets/models/blend/shelf/metal.png
new file mode 100644
(file)
index 0000000..
44a32e8
Binary files /dev/null and b/assets/models/blend/shelf/metal.png differ
diff --git a/assets/models/blend/shelf/normal.png
b/assets/models/blend/shelf/normal.png
new file mode 100644
(file)
index 0000000..
e93077e
Binary files /dev/null and b/assets/models/blend/shelf/normal.png differ
diff --git a/assets/models/blend/shelf/roughness.png
b/assets/models/blend/shelf/roughness.png
new file mode 100644
(file)
index 0000000..
ae7b321
Binary files /dev/null and b/assets/models/blend/shelf/roughness.png differ
diff --git a/assets/models/blend/shelf/shelf.blend
b/assets/models/blend/shelf/shelf.blend
new file mode 100644
(file)
index 0000000..
a97716c
Binary files /dev/null and b/assets/models/blend/shelf/shelf.blend differ
diff --git a/assets/models/blend/teeter_tooter/ao.png
b/assets/models/blend/teeter_tooter/ao.png
new file mode 100644
(file)
index 0000000..
b0dca71
Binary files /dev/null and b/assets/models/blend/teeter_tooter/ao.png differ
diff --git a/assets/models/blend/teeter_tooter/ao_roughness_metal.png
b/assets/models/blend/teeter_tooter/ao_roughness_metal.png
new file mode 100644
(file)
index 0000000..
33167e5
Binary files /dev/null and b/assets/models/blend/teeter_tooter/ao_roughness_metal.png differ
diff --git a/assets/models/blend/teeter_tooter/base.png
b/assets/models/blend/teeter_tooter/base.png
new file mode 100644
(file)
index 0000000..
fd3c84e
Binary files /dev/null and b/assets/models/blend/teeter_tooter/base.png differ
diff --git a/assets/models/blend/teeter_tooter/metal.png
b/assets/models/blend/teeter_tooter/metal.png
new file mode 100644
(file)
index 0000000..
3667673
Binary files /dev/null and b/assets/models/blend/teeter_tooter/metal.png differ
diff --git a/assets/models/blend/teeter_tooter/normal.png
b/assets/models/blend/teeter_tooter/normal.png
new file mode 100644
(file)
index 0000000..
8ac4afd
Binary files /dev/null and b/assets/models/blend/teeter_tooter/normal.png differ
diff --git a/assets/models/blend/teeter_tooter/roughness.png
b/assets/models/blend/teeter_tooter/roughness.png
new file mode 100644
(file)
index 0000000..
3e7d7de
Binary files /dev/null and b/assets/models/blend/teeter_tooter/roughness.png differ
diff --git a/assets/models/blend/teeter_tooter/teeter_tooter.blend
b/assets/models/blend/teeter_tooter/teeter_tooter.blend
new file mode 100644
(file)
index 0000000..
d64532f
Binary files /dev/null and b/assets/models/blend/teeter_tooter/teeter_tooter.blend differ
diff --git
a/lib/build/models.py
b/lib/build/models.py
index 3c8a04872a06509d1f88b9858587073c5b26459d..4b8e32c9403c475969d31614df8efc00114b737e 100644
(file)
--- a/
lib/build/models.py
+++ b/
lib/build/models.py
@@
-51,8
+51,8
@@
class ModelsBuilder():
cmd = 'blender %s --background --python lib/build/blend2gltf.py '
cmd += '-- %s.gltf'
cmd = cmd % (_fname, fname[:-6])
cmd = 'blender %s --background --python lib/build/blend2gltf.py '
cmd += '-- %s.gltf'
cmd = cmd % (_fname, fname[:-6])
- pgltf = 'assets/gltf/'
- gltf_name = _fname.replace('assets/models/', pgltf)
+ pgltf = 'assets/
models/
gltf/'
+ gltf_name = _fname.replace('assets/models/
blend/
', pgltf)
gltf_name = gltf_name.replace('.blend', '.gltf')
if not to_be_built(gltf_name, [_fname]):
return False
gltf_name = gltf_name.replace('.blend', '.gltf')
if not to_be_built(gltf_name, [_fname]):
return False
@@
-60,32
+60,32
@@
class ModelsBuilder():
self._cache_files += [_fname, gltf_name]
files_after = [basename(gname) for gname in glob('./*')]
new_files = [nnm for nnm in files_after if nnm not in files_before]
self._cache_files += [_fname, gltf_name]
files_after = [basename(gname) for gname in glob('./*')]
new_files = [nnm for nnm in files_after if nnm not in files_before]
- new_dir = root.replace('assets/models/', pgltf)
+ new_dir = root.replace('assets/models/
blend/
', pgltf)
rmtree(new_dir, ignore_errors=True)
makedirs(new_dir)
for mname in new_files:
new_name = '%s/%s' % (new_dir, mname)
move(mname, new_name)
info('move %s %s' % (mname, new_name))
rmtree(new_dir, ignore_errors=True)
makedirs(new_dir)
for mname in new_files:
new_name = '%s/%s' % (new_dir, mname)
move(mname, new_name)
info('move %s %s' % (mname, new_name))
- # blender rewrites metal files: let's restore them
- metal_files = [fnm for fnm in glob(new_dir + '/*') if 'metal' in fnm]
- for metal_file in metal_files:
- src = metal_file.replace(pgltf, 'assets/models/')
- if not exists(src):
- src = metal_file.replace(pgltf, 'assets/models/prototypes/')
- src_split = src.split('/')
- src_tracks_idx = src_split.index('tracks')
- before = src_split[:src_tracks_idx]
- after = src_split[src_tracks_idx + 2:]
- src = '/'.join(before + after)
- copyfile(src, metal_file)
+ #
#
blender rewrites metal files: let's restore them
+
#
metal_files = [fnm for fnm in glob(new_dir + '/*') if 'metal' in fnm]
+
#
for metal_file in metal_files:
+
#
src = metal_file.replace(pgltf, 'assets/models/')
+
#
if not exists(src):
+
#
src = metal_file.replace(pgltf, 'assets/models/prototypes/')
+
#
src_split = src.split('/')
+
#
src_tracks_idx = src_split.index('tracks')
+
#
before = src_split[:src_tracks_idx]
+
#
after = src_split[src_tracks_idx + 2:]
+
#
src = '/'.join(before + after)
+
#
copyfile(src, metal_file)
return True
def _export_bam(self, root, fname, mp_mgr):
'''Exports bam files from glTF ones.'''
_fname = '%s/%s' % (root, fname)
return True
def _export_bam(self, root, fname, mp_mgr):
'''Exports bam files from glTF ones.'''
_fname = '%s/%s' % (root, fname)
- gltf_name = (_fname[:-5] + 'gltf').replace('/
models
/', '/gltf/', 1)
- bam_name = (_fname[:-5] + 'bam').replace('/
models
/', '/bam/', 1)
+ gltf_name = (_fname[:-5] + 'gltf').replace('/
blend
/', '/gltf/', 1)
+ bam_name = (_fname[:-5] + 'bam').replace('/
blend
/', '/bam/', 1)
cmd_args = gltf_name, bam_name
# use dds files in place of png/jpg in gltf2bam
copyfile(gltf_name, gltf_name + '.tmp')
cmd_args = gltf_name, bam_name
# use dds files in place of png/jpg in gltf2bam
copyfile(gltf_name, gltf_name + '.tmp')
@@
-96,14
+96,14
@@
class ModelsBuilder():
if ('.png' in line or '.jpg' in line) and '"uri"' in line:
rln = line[line.index('"uri"') + 9:].rstrip(',\n"')
tname = '%s/%s' % (root, rln)
if ('.png' in line or '.jpg' in line) and '"uri"' in line:
rln = line[line.index('"uri"') + 9:].rstrip(',\n"')
tname = '%s/%s' % (root, rln)
- deps += [tname.replace('/models/
', '
/gltf/', 1)]
+ deps += [tname.replace('/models/
blend/', '/models
/gltf/', 1)]
for dep in deps:
tgt = dep.replace('/gltf/', '/bam/', 1)
tgt = tgt.replace('.png', '.dds').replace('.jpg', '.dds')
makedirs(dirname(tgt), exist_ok=True)
info('convert %s %s' % (dep, tgt))
system('convert %s %s' % (dep, tgt))
for dep in deps:
tgt = dep.replace('/gltf/', '/bam/', 1)
tgt = tgt.replace('.png', '.dds').replace('.jpg', '.dds')
makedirs(dirname(tgt), exist_ok=True)
info('convert %s %s' % (dep, tgt))
system('convert %s %s' % (dep, tgt))
- rpl = lambda lin: lin.replace('.png', '.dds').replace('.jpg', '.dds')
+ rpl = lambda lin: lin.replace('.png', '.dds').replace('.jpg', '.dds')
.replace('/png', '/dds').replace('/jpg', '/dds')
with open(gltf_name, 'w') as fgltf:
fgltf.write(''.join([rpl(line) for line in lines]))
makedirs(dirname(bam_name), exist_ok=True)
with open(gltf_name, 'w') as fgltf:
fgltf.write(''.join([rpl(line) for line in lines]))
makedirs(dirname(bam_name), exist_ok=True)
diff --git
a/pmachines/app.py
b/pmachines/app.py
index 73d43a172beea857fed336e0ff1dd2d94cf5f2cd..54b9660fd208c2534afdb99fad9258d989a4943c 100755
(executable)
--- a/
pmachines/app.py
+++ b/
pmachines/app.py
@@
-1,6
+1,6
@@
import argparse
import simplepbr
import argparse
import simplepbr
-import gltf
+
#
import gltf
from glob import glob
from importlib import import_module
from inspect import isclass
from glob import glob
from importlib import import_module
from inspect import isclass
@@
-186,7
+186,7
@@
class PmachinesApp:
props.set_icon_filename('assets/icon/pmachines.ico')
if not args.screenshot:
base.win.request_properties(props)
props.set_icon_filename('assets/icon/pmachines.ico')
if not args.screenshot:
base.win.request_properties(props)
- gltf.patch_loader(base.loader)
+
#
gltf.patch_loader(base.loader)
if self._options['development']['simplepbr']:
self._pipeline = simplepbr.init(
use_normal_maps=True,
if self._options['development']['simplepbr']:
self._pipeline = simplepbr.init(
use_normal_maps=True,
diff --git
a/pmachines/items/background.py
b/pmachines/items/background.py
index 171918accbd096ebda326e16103349fb0a1beda1..870254362dbba589da3f26f96254d791c8bbc0d9 100644
(file)
--- a/
pmachines/items/background.py
+++ b/
pmachines/items/background.py
@@
-12,7
+12,7
@@
class Background:
start_size, end_size = 5, 2.5
offset = 5
for col, row in product(range(ncols), range(nrows)):
start_size, end_size = 5, 2.5
offset = 5
for col, row in product(range(ncols), range(nrows)):
- model = loader.load_model('assets/
gltf/background/background.gltf
')
+ model = loader.load_model('assets/
models/bam/background/background.bam
')
model.set_scale(end_size / start_size)
model.reparent_to(self._root)
total_width, total_height = end_size * ncols, end_size * nrows
model.set_scale(end_size / start_size)
model.reparent_to(self._root)
total_width, total_height = end_size * ncols, end_size * nrows
diff --git
a/pmachines/items/basketball.py
b/pmachines/items/basketball.py
index 0bbf26e54a3a3b1a912b62b30832c63d93d370ef..1063379da8fcf48b77aa803073e5490b8c12b70a 100644
(file)
--- a/
pmachines/items/basketball.py
+++ b/
pmachines/items/basketball.py
@@
-5,7
+5,7
@@
from pmachines.items.item import Item
class Basketball(Item):
def __init__(self, world, plane_node, cb_inst, curr_bottom, repos, mass=1, pos=(0, 0, 0), r=0, count=0, restitution=.92, friction=.6):
class Basketball(Item):
def __init__(self, world, plane_node, cb_inst, curr_bottom, repos, mass=1, pos=(0, 0, 0), r=0, count=0, restitution=.92, friction=.6):
- super().__init__(world, plane_node, cb_inst, curr_bottom, repos, 'assets/
gltf/basketball/basketball.gltf
', .4, mass=mass, pos=pos, r=r, count=count, restitution=restitution, friction=friction)
+ super().__init__(world, plane_node, cb_inst, curr_bottom, repos, 'assets/
models/bam/basketball/basketball.bam
', .4, mass=mass, pos=pos, r=r, count=count, restitution=restitution, friction=friction)
def _set_shape(self, apply_scale=True):
self.node.add_shape(BulletSphereShape(1))
def _set_shape(self, apply_scale=True):
self.node.add_shape(BulletSphereShape(1))
diff --git
a/pmachines/items/box.py
b/pmachines/items/box.py
index 60f51b174d19cfc1579bc5257a83ab2a1733f6d7..dd25992b38e6edaa2c3c3e24ef7449d03d62bc04 100644
(file)
--- a/
pmachines/items/box.py
+++ b/
pmachines/items/box.py
@@
-5,7
+5,7
@@
from pmachines.items.item import Item
class Box(Item):
def __init__(self, world, plane_node, cb_inst, curr_bottom, repos, mass=1, pos=(0, 0, 0), r=0, count=0, restitution=.5, friction=.8, model_scale=1):
class Box(Item):
def __init__(self, world, plane_node, cb_inst, curr_bottom, repos, mass=1, pos=(0, 0, 0), r=0, count=0, restitution=.5, friction=.8, model_scale=1):
- super().__init__(world, plane_node, cb_inst, curr_bottom, repos, 'assets/
gltf/box/box.gltf
', mass=mass, pos=pos, r=r, count=count, restitution=restitution, friction=friction, model_scale=model_scale)
+ super().__init__(world, plane_node, cb_inst, curr_bottom, repos, 'assets/
models/bam/box/box.bam
', mass=mass, pos=pos, r=r, count=count, restitution=restitution, friction=friction, model_scale=model_scale)
def _set_shape(self, apply_scale=True):
self.node.add_shape(BulletBoxShape((.5, .5, .5)))
def _set_shape(self, apply_scale=True):
self.node.add_shape(BulletBoxShape((.5, .5, .5)))
diff --git
a/pmachines/items/domino.py
b/pmachines/items/domino.py
index c654e4826e849d4052d9221782293762b3ad22d3..333305df284b410e80b6f9c3f3d9cff0c2593039 100644
(file)
--- a/
pmachines/items/domino.py
+++ b/
pmachines/items/domino.py
@@
-5,7
+5,7
@@
from pmachines.items.item import Item, StillStrategy
class Domino(Item):
def __init__(self, world, plane_node, cb_inst, curr_bottom, repos, mass=1, pos=(0, 0, 0), r=0, count=0, restitution=.5, friction=.6):
class Domino(Item):
def __init__(self, world, plane_node, cb_inst, curr_bottom, repos, mass=1, pos=(0, 0, 0), r=0, count=0, restitution=.5, friction=.6):
- super().__init__(world, plane_node, cb_inst, curr_bottom, repos, 'assets/
gltf/domino/domino.gltf
', mass=mass, pos=pos, r=r, count=count, restitution=restitution, friction=friction)
+ super().__init__(world, plane_node, cb_inst, curr_bottom, repos, 'assets/
models/bam/domino/domino.bam
', mass=mass, pos=pos, r=r, count=count, restitution=restitution, friction=friction)
def _set_shape(self, apply_scale=True):
self.node.add_shape(BulletBoxShape((.1, .25, .5)))
def _set_shape(self, apply_scale=True):
self.node.add_shape(BulletBoxShape((.1, .25, .5)))
diff --git
a/pmachines/items/shelf.py
b/pmachines/items/shelf.py
index 357ca09ff2346109440e2c4220b2aff6f5ab07bb..2710dd68c5914449fd2182b8fa7df2ff07b0dbd6 100644
(file)
--- a/
pmachines/items/shelf.py
+++ b/
pmachines/items/shelf.py
@@
-5,7
+5,7
@@
from pmachines.items.item import Item
class Shelf(Item):
def __init__(self, world, plane_node, cb_inst, curr_bottom, repos, mass=1, pos=(0, 0, 0), r=0, count=0, restitution=.5, friction=.6):
class Shelf(Item):
def __init__(self, world, plane_node, cb_inst, curr_bottom, repos, mass=1, pos=(0, 0, 0), r=0, count=0, restitution=.5, friction=.6):
- super().__init__(world, plane_node, cb_inst, curr_bottom, repos, 'assets/
gltf/shelf/shelf.gltf
', mass=mass, pos=pos, r=r, count=count, restitution=restitution, friction=friction)
+ super().__init__(world, plane_node, cb_inst, curr_bottom, repos, 'assets/
models/bam/shelf/shelf.bam
', mass=mass, pos=pos, r=r, count=count, restitution=restitution, friction=friction)
def _set_shape(self, apply_scale=True):
self.node.add_shape(BulletBoxShape((1, .5, .05)))
def _set_shape(self, apply_scale=True):
self.node.add_shape(BulletBoxShape((1, .5, .05)))
diff --git
a/pmachines/items/teetertooter.py
b/pmachines/items/teetertooter.py
index d63741d5a61e3cb0d29798698a7c1371121a631f..20adfb9c59e57d71cf519d3217d6fbe1f93e0b83 100644
(file)
--- a/
pmachines/items/teetertooter.py
+++ b/
pmachines/items/teetertooter.py
@@
-6,7
+6,7
@@
from pmachines.items.item import Item
class TeeterTooter(Item):
def __init__(self, world, plane_node, cb_inst, curr_bottom, repos, mass=1, pos=(0, 0, 0), r=0, count=0, restitution=.5, friction=.5):
class TeeterTooter(Item):
def __init__(self, world, plane_node, cb_inst, curr_bottom, repos, mass=1, pos=(0, 0, 0), r=0, count=0, restitution=.5, friction=.5):
- super().__init__(world, plane_node, cb_inst, curr_bottom, repos, 'assets/
gltf/teeter_tooter/teeter_tooter.gltf
', exp_num_contacts=2, mass=mass, pos=pos, r=r, count=count, restitution=restitution, friction=friction, model_scale=.5)
+ super().__init__(world, plane_node, cb_inst, curr_bottom, repos, 'assets/
models/bam/teeter_tooter/teeter_tooter.bam
', exp_num_contacts=2, mass=mass, pos=pos, r=r, count=count, restitution=restitution, friction=friction, model_scale=.5)
def _set_shape(self, apply_scale=True):
scale = self._model_scale if apply_scale else 1
def _set_shape(self, apply_scale=True):
scale = self._model_scale if apply_scale else 1
diff --git
a/pmachines/menu.py
b/pmachines/menu.py
index 5bd16677efe3f4758c057004aa5534582609aacf..3f2e225ec4af49bc8f74450ae61beedf3a945931 100644
(file)
--- a/
pmachines/menu.py
+++ b/
pmachines/menu.py
@@
-25,7
+25,7
@@
class Menu:
self._music = music
self._pipeline = pipeline
self._cursor = MouseCursor(
self._music = music
self._pipeline = pipeline
self._cursor = MouseCursor(
- 'assets/buttons/arrowUpLeft.
png
', (.04, 1, .04), (.5, .5, .5, 1),
+ 'assets/buttons/arrowUpLeft.
dds
', (.04, 1, .04), (.5, .5, .5, 1),
(.01, .01))
self._font = base.loader.load_font('assets/fonts/Hanken-Book.ttf')
self._font.clear()
(.01, .01))
self._font = base.loader.load_font('assets/fonts/Hanken-Book.ttf')
self._font.clear()
@@
-179,7
+179,7
@@
class Menu:
scenes = sorted(scenes, key=lambda elm: elm.sorting)
self.destroy()
self._cursor = MouseCursor(
scenes = sorted(scenes, key=lambda elm: elm.sorting)
self.destroy()
self._cursor = MouseCursor(
- 'assets/buttons/arrowUpLeft.
png
', (.04, 1, .04), (.5, .5, .5, 1),
+ 'assets/buttons/arrowUpLeft.
dds
', (.04, 1, .04), (.5, .5, .5, 1),
(.01, .01))
self._widgets = []
cmn = self._common_btn.copy() | {
(.01, .01))
self._widgets = []
cmn = self._common_btn.copy() | {
@@
-188,13
+188,12
@@
class Menu:
'text_scale': .64}
left = - (dx := .8) * (min(4, len(scenes)) - 1) / 2
for i, cls in enumerate(scenes):
'text_scale': .64}
left = - (dx := .8) * (min(4, len(scenes)) - 1) / 2
for i, cls in enumerate(scenes):
- print(i, cls)
top = .1 if len(scenes) < 5 else .6
row = 0 if i < 4 else 1
self._widgets += [DirectButton(
text=cls.name(), pos=(left + dx * (i % 4), 1, top - dx * row),
command=self.start, extraArgs=[cls], text_wordwrap=6,
top = .1 if len(scenes) < 5 else .6
row = 0 if i < 4 else 1
self._widgets += [DirectButton(
text=cls.name(), pos=(left + dx * (i % 4), 1, top - dx * row),
command=self.start, extraArgs=[cls], text_wordwrap=6,
- frameTexture='assets/images/scenes/%s.
png
' % cls.__name__,
+ frameTexture='assets/images/scenes/%s.
dds
' % cls.__name__,
**cmn)]
for j in range(4):
tnode = self._widgets[-1].component('text%s' % j).textNode
**cmn)]
for j in range(4):
tnode = self._widgets[-1].component('text%s' % j).textNode
@@
-211,14
+210,14
@@
class Menu:
def on_options(self):
self.destroy()
self._cursor = MouseCursor(
def on_options(self):
self.destroy()
self._cursor = MouseCursor(
- 'assets/buttons/arrowUpLeft.
png
', (.04, 1, .04), (.5, .5, .5, 1),
+ 'assets/buttons/arrowUpLeft.
dds
', (.04, 1, .04), (.5, .5, .5, 1),
(.01, .01))
self._set_options()
def on_credits(self):
self.destroy()
self._cursor = MouseCursor(
(.01, .01))
self._set_options()
def on_credits(self):
self.destroy()
self._cursor = MouseCursor(
- 'assets/buttons/arrowUpLeft.
png
', (.04, 1, .04), (.5, .5, .5, 1),
+ 'assets/buttons/arrowUpLeft.
dds
', (.04, 1, .04), (.5, .5, .5, 1),
(.01, .01))
self._set_credits()
(.01, .01))
self._set_credits()
@@
-283,7
+282,7
@@
class Menu:
self._opt_file.store()
self.destroy()
self._cursor = MouseCursor(
self._opt_file.store()
self.destroy()
self._cursor = MouseCursor(
- 'assets/buttons/arrowUpLeft.
png
', (.04, 1, .04), (.5, .5, .5, 1),
+ 'assets/buttons/arrowUpLeft.
dds
', (.04, 1, .04), (.5, .5, .5, 1),
(.01, .01))
self._set_main()
(.01, .01))
self._set_main()
diff --git
a/pmachines/scene.py
b/pmachines/scene.py
index 4f9410496e2d761124b4d35cc9280030e829c9e8..13c05076138e54c56f7be126be25acc3dbf38778 100644
(file)
--- a/
pmachines/scene.py
+++ b/
pmachines/scene.py
@@
-26,7
+26,7
@@
class Scene(DirectObject):
self._reload_cb = reload_cb
self._set_camera()
self._cursor = MouseCursor(
self._reload_cb = reload_cb
self._set_camera()
self._cursor = MouseCursor(
- 'assets/buttons/arrowUpLeft.
png
', (.04, 1, .04), (.5, .5, .5, 1),
+ 'assets/buttons/arrowUpLeft.
dds
', (.04, 1, .04), (.5, .5, .5, 1),
(.01, .01))
self._set_gui()
self._set_lights()
(.01, .01))
self._set_gui()
self._set_lights()
@@
-118,7
+118,7
@@
class Scene(DirectObject):
base.camera.look_at(0, 0, 0)
def __load_img_btn(self, path, col):
base.camera.look_at(0, 0, 0)
def __load_img_btn(self, path, col):
- img = OnscreenImage('assets/buttons/%s.
png
' % path)
+ img = OnscreenImage('assets/buttons/%s.
dds
' % path)
img.set_transparency(True)
img.set_color(col)
img.detach_node()
img.set_transparency(True)
img.set_color(col)
img.detach_node()
@@
-257,7
+257,7
@@
class Scene(DirectObject):
getattr(item, method)(pos)
img = 'move' if method == 'on_click_l' else 'rotate'
if not (img == 'rotate' and not item._instantiated):
getattr(item, method)(pos)
img = 'move' if method == 'on_click_l' else 'rotate'
if not (img == 'rotate' and not item._instantiated):
- self._cursor.set_image('assets/buttons/%s.
png
' % img)
+ self._cursor.set_image('assets/buttons/%s.
dds
' % img)
def on_click_l(self):
self._on_click('on_click_l')
def on_click_l(self):
self._on_click('on_click_l')
@@
-278,7
+278,7
@@
class Scene(DirectObject):
self.__next_btn['frameColor'] = fcols[1]
self._item_active = None
[item.on_release() for item in self.items]
self.__next_btn['frameColor'] = fcols[1]
self._item_active = None
[item.on_release() for item in self.items]
- self._cursor.set_image('assets/buttons/arrowUpLeft.
png
')
+ self._cursor.set_image('assets/buttons/arrowUpLeft.
dds
')
def repos(self):
for item in self.items:
def repos(self):
for item in self.items:
@@
-368,7
+368,7
@@
class Scene(DirectObject):
self.__store_state()
mgr = TextPropertiesManager.get_global_ptr()
for name in ['mouse_l', 'mouse_r']:
self.__store_state()
mgr = TextPropertiesManager.get_global_ptr()
for name in ['mouse_l', 'mouse_r']:
- graphic = OnscreenImage('assets/buttons/%s.
png
' % name)
+ graphic = OnscreenImage('assets/buttons/%s.
dds
' % name)
graphic.set_scale(.5)
graphic.get_texture().set_minfilter(Texture.FTLinearMipmapLinear)
graphic.get_texture().set_anisotropic_degree(2)
graphic.set_scale(.5)
graphic.get_texture().set_minfilter(Texture.FTLinearMipmapLinear)
graphic.get_texture().set_anisotropic_degree(2)
diff --git
a/prj.org
b/prj.org
index 7595e78f9208cff4162ae5ef56e9be2ad51fb37c..7402568ab13b21ca5efe65d3796b7497a1853044 100644
(file)
--- a/
prj.org
+++ b/
prj.org
@@
-1,7
+1,9
@@
* issues
* todo
* issues
* todo
-** use dds files in place of png/jpg
-** use bam files
+** assets/buttons/ -> assets/images/buttons/
+** assets/icon/ -> assets/images/icon/
+** assets/po/ assets/locale/po/
+** create models (python setup.py models) with multiprocessing pool
** refactoring
** build pipeline
** version 0.0.yymmdd
** refactoring
** build pipeline
** version 0.0.yymmdd
diff --git
a/setup.py
b/setup.py
index 27c165bcf28b60ba6b40878ce2846ddc308f264c..89b91d02f988f9cc4417ea5fc22df39c4e14f07c 100644
(file)
--- a/
setup.py
+++ b/
setup.py
@@
-169,7
+169,7
@@
if __name__ == '__main__':
'exclude_patterns': [
'build/*', 'built/*', 'setup.py', 'requirements.txt',
'venv/*', '.git*', '*.pyc', 'options.ini', '__pycache__',
'exclude_patterns': [
'build/*', 'built/*', 'setup.py', 'requirements.txt',
'venv/*', '.git*', '*.pyc', 'options.ini', '__pycache__',
- 'assets/gltf/*', 'assets/models/**/*.blend',
+ 'assets/
models/
gltf/*', 'assets/models/**/*.blend',
'assets/models/**/models/*.png',
'assets/models/**/models/*.jpg'],
'log_filename_strftime': True,
'assets/models/**/models/*.png',
'assets/models/**/models/*.jpg'],
'log_filename_strftime': True,