New textures

This commit is contained in:
2023-06-20 23:57:22 -07:00
parent ac797c8abb
commit b1f16c80cf
46 changed files with 355 additions and 162 deletions

View File

@ -1,43 +1,65 @@
<prefab name="EthPrefab" type="">
<asset type="texture" name="texture_eth_face_day_happy" ref="faceDayHappy" />
<prefab name="EthPrefab" extend="prefabs/EthPrefabBase" type="">
<item>
<MeshRenderer />
<QuadMeshHost xy0="-0.78236397748, 1" xy1="0.78236397748, -1" />
<SimpleTexturedMaterial ref="faceMaterial" />
</item>
<item>
<MeshRenderer />
<QuadMeshHost xy0="-0.78236397748, 1" xy1="0.78236397748, -1" />
<SimpleTexturedMaterial ref="bodyMaterial" />
</item>
<asset type="texture" name="texture_eth_face_day_anger" ref="faceDayAnger" />
<asset type="texture" name="texture_eth_face_day_confused" ref="faceDayConfused" />
<asset type="texture" name="texture_eth_face_day_eyeroll" ref="faceDayEyeroll" />
<asset type="texture" name="texture_eth_face_day_fear" ref="faceDayFear" />
<asset type="texture" name="texture_eth_face_day_happy" ref="faceDayHappy" />
<asset type="texture" name="texture_eth_face_day_haughty" ref="faceDayHaughty" />
<asset type="texture" name="texture_eth_face_day_neutral" ref="faceDayNeutral" />
<asset type="texture" name="texture_eth_face_day_sad" ref="faceDaySad" />
<asset type="texture" name="texture_eth_face_day_surprised" ref="faceDaySurprised" />
<asset type="texture" name="texture_eth_pose_day_front" ref="poseDayFront" />
<asset type="texture" name="texture_eth_pose_day_back" ref="poseDayBack" />
<item>
<MeshRenderer />
<QuadMeshHost />
<SimpleTexturedMaterial texture="faceDayHappy" ref="faceMaterial" />
<TiledSprite ref="faceSprite" tile="0" size="0.5" sizeType="TILED_SPRITE_SIZE_TYPE_HEIGHT_RATIO" />
</item>
<item>
<MeshRenderer />
<QuadMeshHost ref="bodyMesh" />
<SimpleTexturedMaterial texture="poseDayFront" ref="bodyMaterial" />
<TiledSprite ref="bodySprite" tile="0" size="0.5" sizeType="TILED_SPRITE_SIZE_TYPE_HEIGHT_RATIO" />
</item>
<asset type="texture" name="texture_eth_pose_day_cross" ref="poseDayCross" />
<asset type="texture" name="texture_eth_pose_day_front" ref="poseDayFront" />
<asset type="texture" name="texture_eth_pose_day_hips" ref="poseDayHips" />
<asset type="texture" name="texture_eth_pose_day_neutral" ref="poseDayNeutral" />
<code type="properties">
TilesetGrid gridFace;
TilesetGrid gridBody;
StateProperty&lt;int32_t&gt; faceTile;
StateProperty&lt;int32_t&gt; poseTile;
</code>
<code type="init">
gridFace = TilesetGrid(faceDayHappy->texture, 1, 1);
faceSprite->tileset = &amp;gridFace;
gridBody = TilesetGrid(poseDayBack->texture, 1, 1);
bodySprite->tileset = &amp;gridBody;
faceTile = 0;
poseTile = 0;
useEffect([&amp;]{
faceMaterial->texture = (
faceTile == 0 ? &amp;faceDayHappy->texture :
faceTile == 1 ? &amp;faceDayAnger->texture :
nullptr
faceMaterial->texture = &amp;(
faceTile == 0 ? faceDayHappy->texture :
faceTile == 1 ? faceDayAnger->texture :
faceTile == 2 ? faceDayConfused->texture :
faceTile == 3 ? faceDayEyeroll->texture :
faceTile == 4 ? faceDayFear->texture :
faceTile == 5 ? faceDayHaughty->texture :
faceTile == 6 ? faceDayNeutral->texture :
faceTile == 7 ? faceDaySad->texture :
faceTile == 8 ? faceDaySurprised->texture :
faceDayHappy->texture
);
}, faceTile)();
useEffect([&amp;]{
bodyMaterial->texture = &amp;(
poseTile == 0 ? poseDayBack->texture :
poseTile == 1 ? poseDayCross->texture :
poseTile == 2 ? poseDayFront->texture :
poseTile == 3 ? poseDayHips->texture :
poseTile == 4 ? poseDayNeutral->texture :
poseDayBack->texture
);
}, poseTile)();
</code>
</prefab>

View File

@ -1,14 +1,19 @@
<scene name="SceneBase">
<item lookAt="10, 10, 10, 0, 0, 0">
<item lookAt="9999, 9999, 9999, 9999, 9999, 0">
<Camera ref="backCamera" />
</item>
<item position="0, 0, -10">
<MeshRenderer />
<QuadMeshHost xy0="-500, -500" xy1="500, 500" />
<SimpleTexturedMaterial color="COLOR_BLACK" />
</item>
<item ref="eth" prefab="prefabs/EthPrefab" />
<item lookAt="0, 0, 5, 0, 0, 0" >
<!-- <item lookAt="3, 3, 3, 0, 0, 0" > -->
<Camera ref="camera" type="CAMERA_TYPE_ORTHONOGRAPHIC" />
<CameraTexture ref="camTexture" />
<item lookAt="0, 0.075, 2.5, 0, 0.075, 0">
<Camera ref="camera" />
<CameraTexture ref="camTexture" camera="camera" />
</item>
<item>

View File

@ -3,7 +3,7 @@
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
set(LIMINIAL_CHARACTER_SCALE 1.0)
set(LIMINIAL_CHARACTER_SCALE 1.00)
include("${CMAKE_CURRENT_LIST_DIR}/eth/CMakeLists.txt")

View File

@ -3,48 +3,5 @@
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
tool_texture(texture_eth_face_day_anger
FILE="${CMAKE_CURRENT_LIST_DIR}/anger.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_face_day_confused
FILE="${CMAKE_CURRENT_LIST_DIR}/confused.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_face_day_eyeroll
FILE="${CMAKE_CURRENT_LIST_DIR}/eyeroll.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_face_day_fear
FILE="${CMAKE_CURRENT_LIST_DIR}/fear.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_face_day_happy
FILE="${CMAKE_CURRENT_LIST_DIR}/happy.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_face_day_haughty
FILE="${CMAKE_CURRENT_LIST_DIR}/haughty.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_face_day_neutral
FILE="${CMAKE_CURRENT_LIST_DIR}/neutral.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_face_day_sad
FILE="${CMAKE_CURRENT_LIST_DIR}/sad.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_face_day_surprised
FILE="${CMAKE_CURRENT_LIST_DIR}/surprised.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
include(${CMAKE_CURRENT_LIST_DIR}/day/CMakeLists.txt)
include(${CMAKE_CURRENT_LIST_DIR}/night/CMakeLists.txt)

View File

@ -0,0 +1,68 @@
# Copyright (c) 2023 Dominic Masters
#
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
tool_texture(texture_eth_face_day_anger
FILE="${CMAKE_CURRENT_LIST_DIR}/anger.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_day_confused
FILE="${CMAKE_CURRENT_LIST_DIR}/confused.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_day_eyeroll
FILE="${CMAKE_CURRENT_LIST_DIR}/eyeroll.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_day_fear
FILE="${CMAKE_CURRENT_LIST_DIR}/fear.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_day_happy
FILE="${CMAKE_CURRENT_LIST_DIR}/happy.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_day_haughty
FILE="${CMAKE_CURRENT_LIST_DIR}/haughty.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_day_neutral
FILE="${CMAKE_CURRENT_LIST_DIR}/neutral.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_day_sad
FILE="${CMAKE_CURRENT_LIST_DIR}/sad.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_day_surprised
FILE="${CMAKE_CURRENT_LIST_DIR}/surprised.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)

View File

Before

Width:  |  Height:  |  Size: 3.4 MiB

After

Width:  |  Height:  |  Size: 3.4 MiB

View File

Before

Width:  |  Height:  |  Size: 3.0 MiB

After

Width:  |  Height:  |  Size: 3.0 MiB

View File

Before

Width:  |  Height:  |  Size: 3.4 MiB

After

Width:  |  Height:  |  Size: 3.4 MiB

View File

Before

Width:  |  Height:  |  Size: 3.2 MiB

After

Width:  |  Height:  |  Size: 3.2 MiB

View File

Before

Width:  |  Height:  |  Size: 3.1 MiB

After

Width:  |  Height:  |  Size: 3.1 MiB

View File

Before

Width:  |  Height:  |  Size: 3.5 MiB

After

Width:  |  Height:  |  Size: 3.5 MiB

View File

Before

Width:  |  Height:  |  Size: 3.1 MiB

After

Width:  |  Height:  |  Size: 3.1 MiB

View File

Before

Width:  |  Height:  |  Size: 3.1 MiB

After

Width:  |  Height:  |  Size: 3.1 MiB

View File

Before

Width:  |  Height:  |  Size: 3.3 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

View File

@ -0,0 +1,68 @@
# Copyright (c) 2023 Dominic Masters
#
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
tool_texture(texture_eth_face_night_anger
FILE="${CMAKE_CURRENT_LIST_DIR}/anger.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_night_confused
FILE="${CMAKE_CURRENT_LIST_DIR}/confused.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_night_eyeroll
FILE="${CMAKE_CURRENT_LIST_DIR}/eyeroll.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_night_fear
FILE="${CMAKE_CURRENT_LIST_DIR}/fear.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_night_happy
FILE="${CMAKE_CURRENT_LIST_DIR}/happy.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_night_haughty
FILE="${CMAKE_CURRENT_LIST_DIR}/haughty.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_night_neutral
FILE="${CMAKE_CURRENT_LIST_DIR}/neutral.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_night_sad
FILE="${CMAKE_CURRENT_LIST_DIR}/sad.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_face_night_surprised
FILE="${CMAKE_CURRENT_LIST_DIR}/surprised.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 MiB

View File

@ -3,11 +3,5 @@
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
tool_texture(texture_eth_pose_day_front
FILE="${CMAKE_CURRENT_LIST_DIR}/day_front.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_pose_day_back
FILE="${CMAKE_CURRENT_LIST_DIR}/day_back.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
include(${CMAKE_CURRENT_LIST_DIR}/day/CMakeLists.txt)
include(${CMAKE_CURRENT_LIST_DIR}/night/CMakeLists.txt)

View File

@ -0,0 +1,39 @@
# Copyright (c) 2023 Dominic Masters
#
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
tool_texture(texture_eth_pose_day_back
FILE="${CMAKE_CURRENT_LIST_DIR}/back.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_pose_day_cross
FILE="${CMAKE_CURRENT_LIST_DIR}/cross.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_pose_day_front
FILE="${CMAKE_CURRENT_LIST_DIR}/front.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_pose_day_hips
FILE="${CMAKE_CURRENT_LIST_DIR}/hips.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_pose_day_neutral
FILE="${CMAKE_CURRENT_LIST_DIR}/neutral.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)

View File

Before

Width:  |  Height:  |  Size: 12 MiB

After

Width:  |  Height:  |  Size: 12 MiB

View File

Before

Width:  |  Height:  |  Size: 12 MiB

After

Width:  |  Height:  |  Size: 12 MiB

View File

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 11 MiB

View File

Before

Width:  |  Height:  |  Size: 13 MiB

After

Width:  |  Height:  |  Size: 13 MiB

View File

Before

Width:  |  Height:  |  Size: 12 MiB

After

Width:  |  Height:  |  Size: 12 MiB

View File

@ -0,0 +1,39 @@
# Copyright (c) 2023 Dominic Masters
#
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
tool_texture(texture_eth_pose_night_back
FILE="${CMAKE_CURRENT_LIST_DIR}/back.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_pose_night_cross
FILE="${CMAKE_CURRENT_LIST_DIR}/cross.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_pose_night_front
FILE="${CMAKE_CURRENT_LIST_DIR}/front.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_pose_night_hips
FILE="${CMAKE_CURRENT_LIST_DIR}/hips.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)
tool_texture(texture_eth_pose_night_neutral
FILE="${CMAKE_CURRENT_LIST_DIR}/neutral.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
FILTER_MIN=nearest
FILTER_MAG=nearest
)

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 MiB