diff --git a/.gitignore b/.gitignore index cab984c..b4c1863 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ __pycache__ \#* *.gch image/*.DDS +debug/*.rc +release/*.rc \ No newline at end of file diff --git a/Makefile b/Makefile index 33920b6..528ab1b 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ include/scenes/%.hpp: $(COLLADA_PY_SOURCE) src/scenes/%.cpp: scenes/%.DAE include/scenes/%.hpp @mkdir -p $(@D) - PYTHONPATH=. python -m collada.main $< $@ $(<:.DAE=.vtx) $(<:.DAE=.idx) rc/$(notdir $(<:.DAE=.rc)) $(notdir $(<:.DAE=.mk)) + PYTHONPATH=. python -m collada.main $< $@ $(<:.DAE=.vtx) $(<:.DAE=.idx) $(<:.DAE=.vjw) rc/$(notdir $(<:.DAE=.rc)) $(notdir $(<:.DAE=.mk)) # $(BUILD_TYPE)/curve_interpolation.res \ diff --git a/collada/header.py b/collada/header.py index 0f3922c..d9b37f7 100644 --- a/collada/header.py +++ b/collada/header.py @@ -24,6 +24,7 @@ class State: # buffers vertex_buffer: BytesIO index_buffer: BytesIO + joints_weights_vertex_buffer: BytesIO # geometry__indices: # keys: collada id @@ -63,6 +64,7 @@ class State: def __init__(self): self.vertex_buffer = BytesIO() self.index_buffer = BytesIO() + self.joints_weights_vertex_buffer = BytesIO() self.geometry__indices = {} self.geometry__vertex_index_tables = {} self.symbol_names = {} @@ -106,7 +108,7 @@ def sanitize_name(state, name, value, *, allow_slash=False): def renderbin(f, elems, t): fmt = { float: 'OpenCOLLADA for 3ds Max; Version: 1.6; Revision: 68 file:///C:/cygwin/home/bilbo/d3d10/scenes/curve_interpolation/curve_interpolation.max - 2026-01-29T17:33:59 - 2026-01-29T17:33:59 + 2026-01-30T09:40:47 + 2026-01-30T09:40:47 Z_UP @@ -621,6 +621,342 @@ + + + + + + 0 0 0 1 + + + 0.5882353 0.5882353 1 1 + + + 0.5882353 0.5882353 1 1 + + + 0 0 0 1 + + + 10 + + + 0 0 0 1 + + + 1 1 1 1 + + + 1 + + + + + + + + 0 + 0 + 0 + 1.5 + 1 + 0 + 0 + 0 + 3 + + + 1 + 1 + 0 + 0 + 0 + 0 + 0.1 + + + + + + + + + + 0 0 0 1 + + + 0.5882353 0.9450981 1 1 + + + 0.5882353 0.9450981 1 1 + + + 0 0 0 1 + + + 10 + + + 0 0 0 1 + + + 1 1 1 1 + + + 1 + + + + + + + + 0 + 0 + 0 + 1.5 + 1 + 0 + 0 + 0 + 3 + + + 1 + 1 + 0 + 0 + 0 + 0 + 0.1 + + + + + + + + + + 0 0 0 1 + + + 0.5882353 1 0.6156863 1 + + + 0.5882353 1 0.6156863 1 + + + 0 0 0 1 + + + 10 + + + 0 0 0 1 + + + 1 1 1 1 + + + 1 + + + + + + + + 0 + 0 + 0 + 1.5 + 1 + 0 + 0 + 0 + 3 + + + 1 + 1 + 0 + 0 + 0 + 0 + 0.1 + + + + + + + + + + 0 0 0 1 + + + 0.9960785 1 0.5882353 1 + + + 0.9960785 1 0.5882353 1 + + + 0 0 0 1 + + + 10 + + + 0 0 0 1 + + + 1 1 1 1 + + + 1 + + + + + + + + 0 + 0 + 0 + 1.5 + 1 + 0 + 0 + 0 + 3 + + + 1 + 1 + 0 + 0 + 0 + 0 + 0.1 + + + + + + + + + + 0 0 0 1 + + + 0.9960785 0.8196079 0.5882353 1 + + + 0.9960785 0.8196079 0.5882353 1 + + + 0 0 0 1 + + + 10 + + + 0 0 0 1 + + + 1 1 1 1 + + + 1 + + + + + + + + 0 + 0 + 0 + 1.5 + 1 + 0 + 0 + 0 + 3 + + + 1 + 1 + 0 + 0 + 0 + 0 + 0.1 + + + + + + + + + + 0 0 0 1 + + + 1 0.5882353 0.5882353 1 + + + 1 0.5882353 0.5882353 1 + + + 0 0 0 1 + + + 10 + + + 0 0 0 1 + + + 1 1 1 1 + + + 1 + + + + + + + + 0 + 0 + 0 + 1.5 + 1 + 0 + 0 + 0 + 3 + + + 1 + 1 + 0 + 0 + 0 + 0 + 0.1 + + + + @@ -656,6 +992,24 @@ + + + + + + + + + + + + + + + + + + @@ -979,7 +1333,121 @@ + + + + -5 -5 0 5 -5 0 -5 5 0 5 5 0 -5 -5 20 5 -5 20 -5 5 20 5 5 20 -5 -5 4 5 -5 4 5 5 4 -5 5 4 -5 -5 8 5 -5 8 5 5 8 -5 5 8 -5 -5 12 5 -5 12 5 5 12 -5 5 12 -5 -5 16 5 -5 16 5 5 16 -5 5 16 + + + + + + + + + + 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 1 0 0 1 0 0 1 0 0 1 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 + + + + + + + + + + 1 0 0 0 0 0 1 1 0 0 1 0 0 0 0 1 0 0 0 1 0 1 1 0 0 0 0 1 0 0 0 0.2 0 1 0.2 0 0 0.4 0 1 0.4 0 0 0.6 0 1 0.6 0 0 0.8 0 1 0.8 0 0 1 0 1 1 0 0 0 0 1 0 0 0 0.2 0 1 0.2 0 0 0.4 0 1 0.4 0 0 0.6 0 1 0.6 0 0 0.8 0 1 0.8 0 0 1 0 1 1 0 0 0 0 1 0 0 0 0.2 0 1 0.2 0 0 0.4 0 1 0.4 0 0 0.6 0 1 0.6 0 0 0.8 0 1 0.8 0 0 1 0 1 1 0 0 0 0 1 0 0 0 0.2 0 1 0.2 0 0 0.4 0 1 0.4 0 0 0.6 0 1 0.6 0 0 0.8 0 1 0.8 0 0 1 0 1 1 0 + + + + + + + + + + + + + + + +

0 0 0 2 1 2 3 2 3 3 2 3 1 3 1 0 0 0

+
+ + + + +

4 4 4 5 5 5 7 6 7 7 6 7 6 7 6 4 4 4

+
+ + + + +

0 8 8 1 9 9 9 10 11 9 10 11 8 11 10 0 8 8 8 11 10 9 10 11 13 12 13 13 12 13 12 13 12 8 11 10 12 13 12 13 12 13 17 14 15 17 14 15 16 15 14 12 13 12 16 15 14 17 14 15 21 16 17 21 16 17 20 17 16 16 15 14 20 17 16 21 16 17 5 18 19 5 18 19 4 19 18 20 17 16

+
+ + + + +

1 20 20 3 21 21 10 22 23 10 22 23 9 23 22 1 20 20 9 23 22 10 22 23 14 24 25 14 24 25 13 25 24 9 23 22 13 25 24 14 24 25 18 26 27 18 26 27 17 27 26 13 25 24 17 27 26 18 26 27 22 28 29 22 28 29 21 29 28 17 27 26 21 29 28 22 28 29 7 30 31 7 30 31 5 31 30 21 29 28

+
+ + + + +

3 32 32 2 33 33 11 34 35 11 34 35 10 35 34 3 32 32 10 35 34 11 34 35 15 36 37 15 36 37 14 37 36 10 35 34 14 37 36 15 36 37 19 38 39 19 38 39 18 39 38 14 37 36 18 39 38 19 38 39 23 40 41 23 40 41 22 41 40 18 39 38 22 41 40 23 40 41 6 42 43 6 42 43 7 43 42 22 41 40

+
+ + + + +

2 44 44 0 45 45 8 46 47 8 46 47 11 47 46 2 44 44 11 47 46 8 46 47 12 48 49 12 48 49 15 49 48 11 47 46 15 49 48 12 48 49 16 50 51 16 50 51 19 51 50 15 49 48 19 51 50 16 50 51 20 52 53 20 52 53 23 53 52 19 51 50 23 53 52 20 52 53 4 54 55 4 54 55 6 55 54 23 53 52

+
+
+
+ + + + 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 + + joint0 joint1 + + + + + + + + -5.11435e-14 3.13916e-7 1 0 -1.74846e-7 1 -3.13916e-7 0 -1 -1.74846e-7 3.74342e-15 0 0 0 0 1 -8.74227e-8 -5.52335e-7 1 -10 -8.74228e-8 1 5.52335e-7 -9.85461e-6 -1 -8.74227e-8 -8.74227e-8 8.74227e-7 0 0 0 1 + + + + + + + + 1 0.2 0.8 0.2 0.8 0.2 0.8 0.2 0.8 0.4 0.6 0.4 0.6 0.4 0.6 0.4 0.6 0.6 0.4 0.6 0.4 0.6 0.4 0.6 0.4 0.8 0.2 0.8 0.2 0.8 0.2 0.8 0.2 + + + + + + + + + + + + + + 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 + 0 0 0 0 0 0 0 0 1 0 1 0 1 0 1 0 1 1 0 2 1 3 0 4 1 5 0 6 1 7 0 8 1 9 0 10 1 11 0 12 1 13 0 14 1 15 0 16 1 17 0 18 1 19 0 20 1 21 0 22 1 23 0 24 1 25 0 26 1 27 0 28 1 29 0 30 1 31 0 32 + + + + @@ -1004,7 +1472,7 @@ 1 2 1 - 20 + 200 0 0 7 @@ -1040,21 +1508,22 @@ - 10 -1.14258e-7 0 + 34.88703 -1.85427e-6 0 + 3.523671 3.523671 3.523671 - - - + + + - 5 1.14258e-7 2 + 5.000001 1.14258e-7 2 0 0 1 0 0 1 0 2.00358e-5 1 0 0 0 @@ -1085,6 +1554,7 @@ + 3.523671 3.523671 3.523671 @@ -1106,6 +1576,7 @@ 0 0 0.01 0 0 -1 -44.99999 + 3.523672 3.523672 3.523671 @@ -1127,8 +1598,9 @@ + -18.87136 14.31975 0 0 0 0 0 - 1 1 1 + 3.523671 3.523671 3.523671 0 0 0 0 @@ -1147,7 +1619,8 @@ - 2.124535 8.291501 6.185831 + 24 25.52443 19.04236 + 3.523671 3.523671 3.523671 0.5773504 -0.5773501 -0.5773504 -120 @@ -1176,6 +1649,54 @@ + + + #node-Bone001 + + + + + + + + + + + + + + 1 + 1 + 1 + 1 + + + + + 1.32123e-6 1 -1.49608e-6 -90 + + 10 1.19209e-6 5.69993e-14 + 0 0 1 5.00896e-6 + 0 1 0 -5.00896e-6 + 1 0 0 -5.00896e-6 + + + 1 + 1 + 1 + 1 + + + + + + 1 + 1 + 1 + 1 + + + @@ -1189,7 +1710,7 @@ - 10 -10 10 -10 + 34.88703 -34.88703 34.88703 -34.88703 @@ -1197,7 +1718,7 @@ - -0.3332306 10 1.111167 -10 2.778333 10 4.4445 -9.219337 + -0.3332306 34.88703 1.111167 -34.88703 2.778333 34.88703 4.4323 -34.88086 @@ -1206,7 +1727,7 @@ - 0.5555 10 2.222167 -10 3.888333 10 4.000208 -8.594958 + 0.5555 34.88703 2.222167 -34.88703 3.888333 34.88703 4.000208 -29.96252 @@ -1231,7 +1752,7 @@ - -10.05776 10.05852 -9.941484 10.05852 + -35.08854 35.09117 -34.68288 35.09117 @@ -1239,7 +1760,7 @@ - -1.166264 -10.05776 0.2778334 10.05852 1.9445 -9.941484 3.611667 10.05852 + -1.166264 -35.08854 0.2778334 35.09117 1.9445 -34.68288 3.611667 35.09117 @@ -1248,7 +1769,7 @@ - -0.2783333 -10.05776 1.388833 10.05852 3.0555 -9.941484 4.499598 10.05852 + -0.2783333 -35.08854 1.388833 35.09117 3.0555 -34.68288 4.499598 35.09117 @@ -1315,7 +1836,7 @@ - 1 1 1 1.996525 1.996525 1.996525 1 1 1 + 3.523671 3.523671 3.523671 7.035098 7.035098 7.035098 3.523671 3.523671 3.523671 @@ -1325,7 +1846,7 @@ - 0.9997917 1 0.9997917 1 0.9997917 1 1.111167 1.996525 1.111167 1.996525 1.111167 1.996525 2.777833 1 2.777833 1 2.777833 1 + 0.9997917 3.523671 0.9997917 3.523671 0.9997917 3.523671 1.111167 7.035098 1.111167 7.035098 1.111167 7.035098 2.777833 3.523671 2.777833 3.523671 2.777833 3.523671 @@ -1338,7 +1859,7 @@ - 0.5555 1 0.5555 1 0.5555 1 2.222167 1.996525 2.222167 1.996525 2.222167 1.996525 2.333542 1 2.333542 1 2.333542 1 + 0.5555 3.523671 0.5555 3.523671 0.5555 3.523671 2.222167 7.035098 2.222167 7.035098 2.222167 7.035098 2.333542 3.523671 2.333542 3.523671 2.333542 3.523671 @@ -1421,7 +1942,7 @@ - 2.124535 -5.611371 -5.611371 0.04967833 0.04967833 2.124535 2.124535 + 24 -35 -35 5 5 24 24 @@ -1429,7 +1950,7 @@ - 0.9997917 2.124535 0.33335 -5.611371 0.83335 -5.611371 1.33335 0.04967833 1.83335 0.04967833 2.555583 2.124535 3.166683 2.124535 + 0.9997917 24 0.33335 -35 0.83335 -35 1.33335 5 1.83335 5 2.555583 24 3.166683 24 @@ -1438,7 +1959,7 @@ - 0.16665 2.124535 0.66665 -5.611371 1.16665 -5.611371 1.66665 0.04967833 2.27775 0.04967833 2.999983 2.124535 3.666564 2.124535 + 0.16665 24 0.66665 -35 1.16665 -35 1.66665 5 2.27775 5 2.999983 24 3.666564 24 @@ -1463,7 +1984,7 @@ - 8.291501 0.2940993 0.2940993 -3.820096 -3.820096 8.291501 8.291501 + 25.52443 2 2 -20 -20 25.52443 25.52443 @@ -1471,7 +1992,7 @@ - 0.9997917 8.291501 0.33335 0.2940993 0.83335 0.2940993 1.33335 -3.820096 1.83335 -3.820096 2.555583 8.291501 3.166683 8.291501 + 0.9997917 25.52443 0.33335 2 0.83335 2 1.33335 -20 1.83335 -20 2.555583 25.52443 3.166683 25.52443 @@ -1480,7 +2001,7 @@ - 0.16665 8.291501 0.66665 0.2940993 1.16665 0.2940993 1.66665 -3.820096 2.27775 -3.820096 2.999983 8.291501 3.666564 8.291501 + 0.16665 25.52443 0.66665 2 1.16665 2 1.66665 -20 2.27775 -20 2.999983 25.52443 3.666564 25.52443 @@ -1496,44 +2017,44 @@ - - 0 0.5 1 1.5 2 2.833333 3.333333 + + 0 0.4333333 0.8333334 1.266667 1.666667 2.1 2.5 2.933333 3.333333 - + - - 6.185831 6.185831 6.185831 6.185831 6.185831 6.185831 6.185831 + + 180 230 180 130 180 230 180 130 180 - - + + - - 0.9997917 6.185831 0.33335 6.185831 0.83335 6.185831 1.33335 6.185831 1.83335 6.185831 2.555583 6.185831 3.166683 6.185831 + + -0.3332639 180 0.2888889 213.3333 0.7 196.6667 1.122222 146.6667 1.533333 163.3333 1.955556 213.3333 2.366667 196.6667 2.788889 146.6667 3.2 163.3333 - + - - 0.16665 6.185831 0.66665 6.185831 1.16665 6.185831 1.66665 6.185831 2.27775 6.185831 2.999983 6.185831 3.666564 6.185831 + + 0.1444445 196.6667 0.5666667 213.3333 0.9777778 163.3333 1.4 146.6667 1.811111 196.6667 2.233333 213.3333 2.644444 163.3333 3.066667 146.6667 3.666597 180 - + - - BEZIER BEZIER BEZIER BEZIER BEZIER BEZIER BEZIER + + LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR - + @@ -1590,12 +2111,12 @@ - - - - - - + + + + + + @@ -1605,7 +2126,7 @@ - + diff --git a/scenes/curve_interpolation/curve_interpolation.idx b/scenes/curve_interpolation/curve_interpolation.idx index 273bdee..b78f56c 100644 Binary files a/scenes/curve_interpolation/curve_interpolation.idx and b/scenes/curve_interpolation/curve_interpolation.idx differ diff --git a/scenes/curve_interpolation/curve_interpolation.max b/scenes/curve_interpolation/curve_interpolation.max index 2c3710a..c8eb44b 100755 Binary files a/scenes/curve_interpolation/curve_interpolation.max and b/scenes/curve_interpolation/curve_interpolation.max differ diff --git a/scenes/curve_interpolation/curve_interpolation.vjw b/scenes/curve_interpolation/curve_interpolation.vjw new file mode 100644 index 0000000..d7f1e60 Binary files /dev/null and b/scenes/curve_interpolation/curve_interpolation.vjw differ diff --git a/scenes/curve_interpolation/curve_interpolation.vtx b/scenes/curve_interpolation/curve_interpolation.vtx index 67faa88..a258890 100644 Binary files a/scenes/curve_interpolation/curve_interpolation.vtx and b/scenes/curve_interpolation/curve_interpolation.vtx differ diff --git a/src/effect/collada_scene.fx b/src/effect/collada_scene.fx index a0f8713..f9cc282 100644 --- a/src/effect/collada_scene.fx +++ b/src/effect/collada_scene.fx @@ -87,7 +87,7 @@ float4 PS(PS_INPUT input) : SV_Target float diffuse_intensity = max(dot(normal, light_dir), 0.0); float distance = length(LightPos[i].xyz - input.WPos.xyz); - float attenuation = 1.0 / (0.02 * distance * distance); + float attenuation = 1.0 / (0.002 * distance * distance); color += diffuseColor * diffuse_intensity * LightColor[i].xyz * attenuation; } diff --git a/src/main.cpp b/src/main.cpp index bc4df1a..1c8a11d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -129,7 +129,7 @@ XMFLOAT4 g_vLightColors[2] = { // -XMVECTOR g_Eye = XMVectorSet(0.0f, -10.0f, 13.0f, 1.0f); +XMVECTOR g_Eye = XMVectorSet(0.0f, -40.0f, 25.0f, 1.0f); XMVECTOR g_At = XMVectorSet(0.0f, 0.0f, 0.0f, 1.0f); // collada scene state diff --git a/src/scenes/curve_interpolation/curve_interpolation.cpp b/src/scenes/curve_interpolation/curve_interpolation.cpp index 12d2e77..ca6088d 100644 --- a/src/scenes/curve_interpolation/curve_interpolation.cpp +++ b/src/scenes/curve_interpolation/curve_interpolation.cpp @@ -22,24 +22,24 @@ float const array_node_cube_translation_x_input_array[] = { }; float const array_node_cube_translation_x_output_array[] = { - 10.0f, - -10.0f, - 10.0f, - -10.0f, + 34.88703f, + -34.88703f, + 34.88703f, + -34.88703f, }; float const array_node_cube_translation_x_intangent_array[] = { - -0.3332306f, 10.0f, - 1.111167f, -10.0f, - 2.778333f, 10.0f, - 4.4445f, -9.219337f, + -0.3332306f, 34.88703f, + 1.111167f, -34.88703f, + 2.778333f, 34.88703f, + 4.4323f, -34.88086f, }; float const array_node_cube_translation_x_outtangent_array[] = { - 0.5555f, 10.0f, - 2.222167f, -10.0f, - 3.888333f, 10.0f, - 4.000208f, -8.594958f, + 0.5555f, 34.88703f, + 2.222167f, -34.88703f, + 3.888333f, 34.88703f, + 4.000208f, -29.96252f, }; enum interpolation const array_node_cube_translation_x_interpolation_array[] = { @@ -90,24 +90,24 @@ float const array_node_cube_translation_y_input_array[] = { }; float const array_node_cube_translation_y_output_array[] = { - -10.05776f, - 10.05852f, - -9.941484f, - 10.05852f, + -35.08854f, + 35.09117f, + -34.68288f, + 35.09117f, }; float const array_node_cube_translation_y_intangent_array[] = { - -1.166264f, -10.05776f, - 0.2778334f, 10.05852f, - 1.9445f, -9.941484f, - 3.611667f, 10.05852f, + -1.166264f, -35.08854f, + 0.2778334f, 35.09117f, + 1.9445f, -34.68288f, + 3.611667f, 35.09117f, }; float const array_node_cube_translation_y_outtangent_array[] = { - -0.2783333f, -10.05776f, - 1.388833f, 10.05852f, - 3.0555f, -9.941484f, - 4.499598f, 10.05852f, + -0.2783333f, -35.08854f, + 1.388833f, 35.09117f, + 3.0555f, -34.68288f, + 4.499598f, 35.09117f, }; enum interpolation const array_node_cube_translation_y_interpolation_array[] = { @@ -230,21 +230,21 @@ float const array_node_geosphere_scale_input_array[] = { }; float const array_node_geosphere_scale_output_array[] = { - 1.0f, 1.0f, 1.0f, - 1.996525f, 1.996525f, 1.996525f, - 1.0f, 1.0f, 1.0f, + 3.523671f, 3.523671f, 3.523671f, + 7.035098f, 7.035098f, 7.035098f, + 3.523671f, 3.523671f, 3.523671f, }; float const array_node_geosphere_scale_intangent_array[] = { - 0.9997917f, 1.0f, 0.9997917f, 1.0f, 0.9997917f, 1.0f, - 1.111167f, 1.996525f, 1.111167f, 1.996525f, 1.111167f, 1.996525f, - 2.777833f, 1.0f, 2.777833f, 1.0f, 2.777833f, 1.0f, + 0.9997917f, 3.523671f, 0.9997917f, 3.523671f, 0.9997917f, 3.523671f, + 1.111167f, 7.035098f, 1.111167f, 7.035098f, 1.111167f, 7.035098f, + 2.777833f, 3.523671f, 2.777833f, 3.523671f, 2.777833f, 3.523671f, }; float const array_node_geosphere_scale_outtangent_array[] = { - 0.5555f, 1.0f, 0.5555f, 1.0f, 0.5555f, 1.0f, - 2.222167f, 1.996525f, 2.222167f, 1.996525f, 2.222167f, 1.996525f, - 2.333542f, 1.0f, 2.333542f, 1.0f, 2.333542f, 1.0f, + 0.5555f, 3.523671f, 0.5555f, 3.523671f, 0.5555f, 3.523671f, + 2.222167f, 7.035098f, 2.222167f, 7.035098f, 2.222167f, 7.035098f, + 2.333542f, 3.523671f, 2.333542f, 3.523671f, 2.333542f, 3.523671f, }; enum interpolation const array_node_geosphere_scale_interpolation_array[] = { @@ -375,33 +375,33 @@ float const array_node_light_translation_x_input_array[] = { }; float const array_node_light_translation_x_output_array[] = { - 2.124535f, - -5.611371f, - -5.611371f, - 0.04967833f, - 0.04967833f, - 2.124535f, - 2.124535f, + 24.0f, + -35.0f, + -35.0f, + 5.0f, + 5.0f, + 24.0f, + 24.0f, }; float const array_node_light_translation_x_intangent_array[] = { - 0.9997917f, 2.124535f, - 0.33335f, -5.611371f, - 0.83335f, -5.611371f, - 1.33335f, 0.04967833f, - 1.83335f, 0.04967833f, - 2.555583f, 2.124535f, - 3.166683f, 2.124535f, + 0.9997917f, 24.0f, + 0.33335f, -35.0f, + 0.83335f, -35.0f, + 1.33335f, 5.0f, + 1.83335f, 5.0f, + 2.555583f, 24.0f, + 3.166683f, 24.0f, }; float const array_node_light_translation_x_outtangent_array[] = { - 0.16665f, 2.124535f, - 0.66665f, -5.611371f, - 1.16665f, -5.611371f, - 1.66665f, 0.04967833f, - 2.27775f, 0.04967833f, - 2.999983f, 2.124535f, - 3.666564f, 2.124535f, + 0.16665f, 24.0f, + 0.66665f, -35.0f, + 1.16665f, -35.0f, + 1.66665f, 5.0f, + 2.27775f, 5.0f, + 2.999983f, 24.0f, + 3.666564f, 24.0f, }; enum interpolation const array_node_light_translation_x_interpolation_array[] = { @@ -458,33 +458,33 @@ float const array_node_light_translation_y_input_array[] = { }; float const array_node_light_translation_y_output_array[] = { - 8.291501f, - 0.2940993f, - 0.2940993f, - -3.820096f, - -3.820096f, - 8.291501f, - 8.291501f, + 25.52443f, + 2.0f, + 2.0f, + -20.0f, + -20.0f, + 25.52443f, + 25.52443f, }; float const array_node_light_translation_y_intangent_array[] = { - 0.9997917f, 8.291501f, - 0.33335f, 0.2940993f, - 0.83335f, 0.2940993f, - 1.33335f, -3.820096f, - 1.83335f, -3.820096f, - 2.555583f, 8.291501f, - 3.166683f, 8.291501f, + 0.9997917f, 25.52443f, + 0.33335f, 2.0f, + 0.83335f, 2.0f, + 1.33335f, -20.0f, + 1.83335f, -20.0f, + 2.555583f, 25.52443f, + 3.166683f, 25.52443f, }; float const array_node_light_translation_y_outtangent_array[] = { - 0.16665f, 8.291501f, - 0.66665f, 0.2940993f, - 1.16665f, 0.2940993f, - 1.66665f, -3.820096f, - 2.27775f, -3.820096f, - 2.999983f, 8.291501f, - 3.666564f, 8.291501f, + 0.16665f, 25.52443f, + 0.66665f, 2.0f, + 1.16665f, 2.0f, + 1.66665f, -20.0f, + 2.27775f, -20.0f, + 2.999983f, 25.52443f, + 3.666564f, 25.52443f, }; enum interpolation const array_node_light_translation_y_interpolation_array[] = { @@ -530,85 +530,95 @@ sampler const sampler_node_light_translation_y_sampler = { }, }; -float const array_node_light_translation_z_input_array[] = { +float const array_node_bone002_rotationz_angle_input_array[] = { 0.0f, - 0.5f, - 1.0f, - 1.5f, - 2.0f, - 2.833333f, + 0.4333333f, + 0.8333334f, + 1.266667f, + 1.666667f, + 2.1f, + 2.5f, + 2.933333f, 3.333333f, }; -float const array_node_light_translation_z_output_array[] = { - 6.185831f, - 6.185831f, - 6.185831f, - 6.185831f, - 6.185831f, - 6.185831f, - 6.185831f, +float const array_node_bone002_rotationz_angle_output_array[] = { + 180.0f, + 230.0f, + 180.0f, + 130.0f, + 180.0f, + 230.0f, + 180.0f, + 130.0f, + 180.0f, }; -float const array_node_light_translation_z_intangent_array[] = { - 0.9997917f, 6.185831f, - 0.33335f, 6.185831f, - 0.83335f, 6.185831f, - 1.33335f, 6.185831f, - 1.83335f, 6.185831f, - 2.555583f, 6.185831f, - 3.166683f, 6.185831f, +float const array_node_bone002_rotationz_angle_intangent_array[] = { + -0.3332639f, 180.0f, + 0.2888889f, 213.3333f, + 0.7f, 196.6667f, + 1.122222f, 146.6667f, + 1.533333f, 163.3333f, + 1.955556f, 213.3333f, + 2.366667f, 196.6667f, + 2.788889f, 146.6667f, + 3.2f, 163.3333f, }; -float const array_node_light_translation_z_outtangent_array[] = { - 0.16665f, 6.185831f, - 0.66665f, 6.185831f, - 1.16665f, 6.185831f, - 1.66665f, 6.185831f, - 2.27775f, 6.185831f, - 2.999983f, 6.185831f, - 3.666564f, 6.185831f, +float const array_node_bone002_rotationz_angle_outtangent_array[] = { + 0.1444445f, 196.6667f, + 0.5666667f, 213.3333f, + 0.9777778f, 163.3333f, + 1.4f, 146.6667f, + 1.811111f, 196.6667f, + 2.233333f, 213.3333f, + 2.644444f, 163.3333f, + 3.066667f, 146.6667f, + 3.666597f, 180.0f, }; -enum interpolation const array_node_light_translation_z_interpolation_array[] = { - interpolation::BEZIER, - interpolation::BEZIER, - interpolation::BEZIER, - interpolation::BEZIER, - interpolation::BEZIER, - interpolation::BEZIER, - interpolation::BEZIER, +enum interpolation const array_node_bone002_rotationz_angle_interpolation_array[] = { + interpolation::LINEAR, + interpolation::LINEAR, + interpolation::LINEAR, + interpolation::LINEAR, + interpolation::LINEAR, + interpolation::LINEAR, + interpolation::LINEAR, + interpolation::LINEAR, + interpolation::LINEAR, }; -sampler const sampler_node_light_translation_z_sampler = { - // node_light_translation_z_input +sampler const sampler_node_bone002_rotationz_angle_sampler = { + // node_bone002_rotationz_angle_input .input = { - .float_array = array_node_light_translation_z_input_array, - .count = 7, + .float_array = array_node_bone002_rotationz_angle_input_array, + .count = 9, .stride = 1, }, - // node_light_translation_z_output + // node_bone002_rotationz_angle_output .output = { - .float_array = array_node_light_translation_z_output_array, - .count = 7, + .float_array = array_node_bone002_rotationz_angle_output_array, + .count = 9, .stride = 1, }, - // node_light_translation_z_intangent + // node_bone002_rotationz_angle_intangent .in_tangent = { - .float_array = array_node_light_translation_z_intangent_array, - .count = 7, + .float_array = array_node_bone002_rotationz_angle_intangent_array, + .count = 9, .stride = 2, }, - // node_light_translation_z_outtangent + // node_bone002_rotationz_angle_outtangent .out_tangent = { - .float_array = array_node_light_translation_z_outtangent_array, - .count = 7, + .float_array = array_node_bone002_rotationz_angle_outtangent_array, + .count = 9, .stride = 2, }, - // node_light_translation_z_interpolation + // node_bone002_rotationz_angle_interpolation .interpolation = { - .interpolation_array = array_node_light_translation_z_interpolation_array, - .count = 7, + .interpolation_array = array_node_bone002_rotationz_angle_interpolation_array, + .count = 9, .stride = 1, }, }; @@ -633,19 +643,19 @@ channel const node_channel_node_torus_rotationx_angle = { channel const node_channel_node_geosphere_scale = { .source_sampler = &sampler_node_geosphere_scale_sampler, - .target_transform_index = 1, + .target_transform_index = 2, .target_attribute = target_attribute::ALL, }; channel const node_channel_node_geosphere_inversescaleaxisrotation = { .source_sampler = &sampler_node_geosphere_inversescaleaxisrotation_sampler, - .target_transform_index = 0, + .target_transform_index = 1, .target_attribute = target_attribute::ALL, }; channel const node_channel_node_geosphere_scaleaxisrotation = { .source_sampler = &sampler_node_geosphere_scaleaxisrotation_sampler, - .target_transform_index = 2, + .target_transform_index = 3, .target_attribute = target_attribute::ALL, }; @@ -661,10 +671,10 @@ channel const node_channel_node_light_translation_y = { .target_attribute = target_attribute::Y, }; -channel const node_channel_node_light_translation_z = { - .source_sampler = &sampler_node_light_translation_z_sampler, - .target_transform_index = 0, - .target_attribute = target_attribute::Z, +channel const node_channel_node_bone002_rotationz_angle = { + .source_sampler = &sampler_node_bone002_rotationz_angle_sampler, + .target_transform_index = 1, + .target_attribute = target_attribute::ANGLE, }; // american_cherry_png @@ -1068,6 +1078,210 @@ effect const effect_lightemit = { } }; +effect const effect_material__13 = { + .type = effect_type::BLINN, + .blinn = { + .emission = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .ambient = { + .type = color_or_texture_type::COLOR, + .color = {0.5882353f, 0.5882353f, 1.0f, 1.0f}, + }, + .diffuse = { + .type = color_or_texture_type::COLOR, + .color = {0.5882353f, 0.5882353f, 1.0f, 1.0f}, + }, + .specular = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .shininess = 10.0f, + .reflective = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .reflectivity = 0.0f, + .transparent = { + .type = color_or_texture_type::COLOR, + .color = {1.0f, 1.0f, 1.0f, 1.0f}, + }, + .transparency = 1.0f, + .index_of_refraction = 0.0f, + } +}; + +effect const effect_material__14 = { + .type = effect_type::BLINN, + .blinn = { + .emission = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .ambient = { + .type = color_or_texture_type::COLOR, + .color = {0.5882353f, 0.9450981f, 1.0f, 1.0f}, + }, + .diffuse = { + .type = color_or_texture_type::COLOR, + .color = {0.5882353f, 0.9450981f, 1.0f, 1.0f}, + }, + .specular = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .shininess = 10.0f, + .reflective = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .reflectivity = 0.0f, + .transparent = { + .type = color_or_texture_type::COLOR, + .color = {1.0f, 1.0f, 1.0f, 1.0f}, + }, + .transparency = 1.0f, + .index_of_refraction = 0.0f, + } +}; + +effect const effect_material__15_1 = { + .type = effect_type::BLINN, + .blinn = { + .emission = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .ambient = { + .type = color_or_texture_type::COLOR, + .color = {0.5882353f, 1.0f, 0.6156863f, 1.0f}, + }, + .diffuse = { + .type = color_or_texture_type::COLOR, + .color = {0.5882353f, 1.0f, 0.6156863f, 1.0f}, + }, + .specular = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .shininess = 10.0f, + .reflective = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .reflectivity = 0.0f, + .transparent = { + .type = color_or_texture_type::COLOR, + .color = {1.0f, 1.0f, 1.0f, 1.0f}, + }, + .transparency = 1.0f, + .index_of_refraction = 0.0f, + } +}; + +effect const effect_material__16_1 = { + .type = effect_type::BLINN, + .blinn = { + .emission = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .ambient = { + .type = color_or_texture_type::COLOR, + .color = {0.9960785f, 1.0f, 0.5882353f, 1.0f}, + }, + .diffuse = { + .type = color_or_texture_type::COLOR, + .color = {0.9960785f, 1.0f, 0.5882353f, 1.0f}, + }, + .specular = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .shininess = 10.0f, + .reflective = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .reflectivity = 0.0f, + .transparent = { + .type = color_or_texture_type::COLOR, + .color = {1.0f, 1.0f, 1.0f, 1.0f}, + }, + .transparency = 1.0f, + .index_of_refraction = 0.0f, + } +}; + +effect const effect_material__17_1 = { + .type = effect_type::BLINN, + .blinn = { + .emission = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .ambient = { + .type = color_or_texture_type::COLOR, + .color = {0.9960785f, 0.8196079f, 0.5882353f, 1.0f}, + }, + .diffuse = { + .type = color_or_texture_type::COLOR, + .color = {0.9960785f, 0.8196079f, 0.5882353f, 1.0f}, + }, + .specular = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .shininess = 10.0f, + .reflective = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .reflectivity = 0.0f, + .transparent = { + .type = color_or_texture_type::COLOR, + .color = {1.0f, 1.0f, 1.0f, 1.0f}, + }, + .transparency = 1.0f, + .index_of_refraction = 0.0f, + } +}; + +effect const effect_material__18_1 = { + .type = effect_type::BLINN, + .blinn = { + .emission = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .ambient = { + .type = color_or_texture_type::COLOR, + .color = {1.0f, 0.5882353f, 0.5882353f, 1.0f}, + }, + .diffuse = { + .type = color_or_texture_type::COLOR, + .color = {1.0f, 0.5882353f, 0.5882353f, 1.0f}, + }, + .specular = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .shininess = 10.0f, + .reflective = { + .type = color_or_texture_type::COLOR, + .color = {0.0f, 0.0f, 0.0f, 1.0f}, + }, + .reflectivity = 0.0f, + .transparent = { + .type = color_or_texture_type::COLOR, + .color = {1.0f, 1.0f, 1.0f, 1.0f}, + }, + .transparency = 1.0f, + .index_of_refraction = 0.0f, + } +}; + material const material_coloreffectr26g177b26_material = { .effect = &effect_coloreffectr26g177b26, }; @@ -1112,6 +1326,30 @@ material const material_lightemit_material = { .effect = &effect_lightemit, }; +material const material_material__13_material = { + .effect = &effect_material__13, +}; + +material const material_material__14_material = { + .effect = &effect_material__14, +}; + +material const material_material__15_1_material = { + .effect = &effect_material__15_1, +}; + +material const material_material__16_1_material = { + .effect = &effect_material__16_1, +}; + +material const material_material__17_1_material = { + .effect = &effect_material__17_1, +}; + +material const material_material__18_1_material = { + .effect = &effect_material__18_1, +}; + input_element const input_elements_position_0_3_normal_0_3_texcoord_0_3[] = { { .semantic = "POSITION", @@ -1281,6 +1519,52 @@ geometry const geometry_geom_lightindicator = { } }; +triangles const triangles_geom_box001[] = { + { + .count = 2, // triangles + .index_offset = 0, // indices + .inputs_index = 0, // index into inputs_list + }, + { + .count = 2, // triangles + .index_offset = 6, // indices + .inputs_index = 0, // index into inputs_list + }, + { + .count = 10, // triangles + .index_offset = 12, // indices + .inputs_index = 0, // index into inputs_list + }, + { + .count = 10, // triangles + .index_offset = 42, // indices + .inputs_index = 0, // index into inputs_list + }, + { + .count = 10, // triangles + .index_offset = 72, // indices + .inputs_index = 0, // index into inputs_list + }, + { + .count = 10, // triangles + .index_offset = 102, // indices + .inputs_index = 0, // index into inputs_list + }, +}; + +geometry const geometry_geom_box001 = { + .mesh = { + .triangles = triangles_geom_box001, + .triangles_count = 6, + + .vertex_buffer_offset = 12492, + .vertex_buffer_size = 2016, + + .index_buffer_offset = 3984, + .index_buffer_size = 528, + } +}; + geometry const * const geometries[] = { &geometry_geom_cube, &geometry_geom_torus, @@ -1288,6 +1572,31 @@ geometry const * const geometries[] = { &geometry_geom_plane, &geometry_geom_geosphere, &geometry_geom_lightindicator, + &geometry_geom_box001, +}; + +matrix const inverse_bind_matrices_geom_box001_skin1[] = { + { + -5.11435e-14f, -1.74846e-07f, -1.0f, 0.0f, + 3.13916e-07f, 1.0f, -1.74846e-07f, 0.0f, + 1.0f, -3.13916e-07f, 3.74342e-15f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }, + { + -8.74227e-08f, -8.74228e-08f, -1.0f, 0.0f, + -5.52335e-07f, 1.0f, -8.74227e-08f, 0.0f, + 1.0f, 5.52335e-07f, -8.74227e-08f, 0.0f, + -10.0f, -9.85461e-06f, 8.74227e-07f, 1.0f, + }, +}; + +controller const controller_geom_box001_skin1 = { + .skin = { + .inverse_bind_matrices = inverse_bind_matrices_geom_box001_skin1, + + .vertex_buffer_offset = 0, + .vertex_buffer_size = 1792, + } }; transform const transforms_node_environmentambientlight[] = { @@ -1331,29 +1640,15 @@ node const node_node_environmentambientlight = { transform const transforms_node_cube[] = { { .type = transform_type::TRANSLATE, - .translate = {10.0f, -1.14258e-07f, 0.0f}, + .translate = {34.88703f, -1.85427e-06f, 0.0f}, + }, + { + .type = transform_type::SCALE, + .scale = {3.523671f, 3.523671f, 3.523671f}, }, }; instance_material const instance_geometry_instance_materials_node_cube_0[] = { - { - .element_index = 1, // an index into mesh.triangles - .material = &material_material__15_material, - - .emission = { .input_set = -1 }, - .ambient = { .input_set = -1 }, - .diffuse = { .input_set = -1 }, - .specular = { .input_set = -1 }, - }, - { - .element_index = 0, // an index into mesh.triangles - .material = &material_material__16_material, - - .emission = { .input_set = -1 }, - .ambient = { .input_set = -1 }, - .diffuse = { .input_set = -1 }, - .specular = { .input_set = -1 }, - }, { .element_index = 5, // an index into mesh.triangles .material = &material_material__17_material, @@ -1363,15 +1658,6 @@ instance_material const instance_geometry_instance_materials_node_cube_0[] = { .diffuse = { .input_set = -1 }, .specular = { .input_set = -1 }, }, - { - .element_index = 4, // an index into mesh.triangles - .material = &material_material__20_material, - - .emission = { .input_set = -1 }, - .ambient = { .input_set = -1 }, - .diffuse = { .input_set = -1 }, - .specular = { .input_set = -1 }, - }, { .element_index = 3, // an index into mesh.triangles .material = &material_material__18_material, @@ -1385,6 +1671,33 @@ instance_material const instance_geometry_instance_materials_node_cube_0[] = { .element_index = 2, // an index into mesh.triangles .material = &material_material__19_material, + .emission = { .input_set = -1 }, + .ambient = { .input_set = -1 }, + .diffuse = { .input_set = -1 }, + .specular = { .input_set = -1 }, + }, + { + .element_index = 4, // an index into mesh.triangles + .material = &material_material__20_material, + + .emission = { .input_set = -1 }, + .ambient = { .input_set = -1 }, + .diffuse = { .input_set = -1 }, + .specular = { .input_set = -1 }, + }, + { + .element_index = 1, // an index into mesh.triangles + .material = &material_material__15_material, + + .emission = { .input_set = -1 }, + .ambient = { .input_set = -1 }, + .diffuse = { .input_set = -1 }, + .specular = { .input_set = -1 }, + }, + { + .element_index = 0, // an index into mesh.triangles + .material = &material_material__16_material, + .emission = { .input_set = -1 }, .ambient = { .input_set = -1 }, .diffuse = { .input_set = -1 }, @@ -1408,8 +1721,8 @@ instance_light const instance_lights_node_cube[] = { }; channel const * const node_channels_node_cube[] = { - &node_channel_node_cube_translation_x, &node_channel_node_cube_translation_y, + &node_channel_node_cube_translation_x, }; node const node_node_cube = { @@ -1418,7 +1731,7 @@ node const node_node_cube = { .type = node_type::NODE, .transforms = transforms_node_cube, - .transforms_count = 1, + .transforms_count = 2, .instance_geometries = instance_geometries_node_cube, .instance_geometries_count = 1, @@ -1436,7 +1749,7 @@ node const node_node_cube = { transform const transforms_node_torus[] = { { .type = transform_type::TRANSLATE, - .translate = {5.0f, 1.14258e-07f, 2.0f}, + .translate = {5.000001f, 1.14258e-07f, 2.0f}, }, { .type = transform_type::ROTATE, @@ -1509,6 +1822,10 @@ node const node_node_torus = { }; transform const transforms_node_cylinder[] = { + { + .type = transform_type::SCALE, + .scale = {3.523671f, 3.523671f, 3.523671f}, + }, }; instance_material const instance_geometry_instance_materials_node_cylinder_0[] = { @@ -1547,7 +1864,7 @@ node const node_node_cylinder = { .type = node_type::NODE, .transforms = transforms_node_cylinder, - .transforms_count = 0, + .transforms_count = 1, .instance_geometries = instance_geometries_node_cylinder, .instance_geometries_count = 1, @@ -1571,6 +1888,10 @@ transform const transforms_node_plane[] = { .type = transform_type::ROTATE, .rotate = {0.0f, 0.0f, -1.0f, -44.99999f}, }, + { + .type = transform_type::SCALE, + .scale = {3.523672f, 3.523672f, 3.523671f}, + }, }; instance_material const instance_geometry_instance_materials_node_plane_0[] = { @@ -1609,7 +1930,7 @@ node const node_node_plane = { .type = node_type::NODE, .transforms = transforms_node_plane, - .transforms_count = 2, + .transforms_count = 3, .instance_geometries = instance_geometries_node_plane, .instance_geometries_count = 1, @@ -1625,13 +1946,17 @@ node const node_node_plane = { }; transform const transforms_node_geosphere[] = { + { + .type = transform_type::TRANSLATE, + .translate = {-18.87136f, 14.31975f, 0.0f}, + }, { .type = transform_type::ROTATE, .rotate = {0.0f, 0.0f, 0.0f, 0.0f}, }, { .type = transform_type::SCALE, - .scale = {1.0f, 1.0f, 1.0f}, + .scale = {3.523671f, 3.523671f, 3.523671f}, }, { .type = transform_type::ROTATE, @@ -1667,9 +1992,9 @@ instance_light const instance_lights_node_geosphere[] = { }; channel const * const node_channels_node_geosphere[] = { - &node_channel_node_geosphere_inversescaleaxisrotation, &node_channel_node_geosphere_scale, &node_channel_node_geosphere_scaleaxisrotation, + &node_channel_node_geosphere_inversescaleaxisrotation, }; node const node_node_geosphere = { @@ -1678,7 +2003,7 @@ node const node_node_geosphere = { .type = node_type::NODE, .transforms = transforms_node_geosphere, - .transforms_count = 3, + .transforms_count = 4, .instance_geometries = instance_geometries_node_geosphere, .instance_geometries_count = 1, @@ -1696,7 +2021,11 @@ node const node_node_geosphere = { transform const transforms_node_light[] = { { .type = transform_type::TRANSLATE, - .translate = {2.124535f, 8.291501f, 6.185831f}, + .translate = {24.0f, 25.52443f, 19.04236f}, + }, + { + .type = transform_type::SCALE, + .scale = {3.523671f, 3.523671f, 3.523671f}, }, }; @@ -1713,9 +2042,8 @@ instance_light const instance_lights_node_light[] = { }; channel const * const node_channels_node_light[] = { - &node_channel_node_light_translation_x, - &node_channel_node_light_translation_z, &node_channel_node_light_translation_y, + &node_channel_node_light_translation_x, }; node const node_node_light = { @@ -1724,7 +2052,7 @@ node const node_node_light = { .type = node_type::NODE, .transforms = transforms_node_light, - .transforms_count = 1, + .transforms_count = 2, .instance_geometries = instance_geometries_node_light, .instance_geometries_count = 0, @@ -1736,7 +2064,7 @@ node const node_node_light = { .instance_lights_count = 1, .channels = node_channels_node_light, - .channels_count = 3, + .channels_count = 2, }; transform const transforms_node_lightindicator[] = { @@ -1797,6 +2125,206 @@ node const node_node_lightindicator = { .channels_count = 0, }; +transform const transforms_node_box001[] = { +}; + +instance_geometry const instance_geometries_node_box001[] = { +}; + +int const joint_node_indices_node_box001_geom_box001_skin1[] = { + 9, // joint0 node_bone001 + 10, // joint1 node_bone002 +}; + +instance_material const instance_controller_instance_materials_node_box001_0[] = { + { + .element_index = 1, // an index into mesh.triangles + .material = &material_material__13_material, + + .emission = { .input_set = -1 }, + .ambient = { .input_set = -1 }, + .diffuse = { .input_set = -1 }, + .specular = { .input_set = -1 }, + }, + { + .element_index = 0, // an index into mesh.triangles + .material = &material_material__14_material, + + .emission = { .input_set = -1 }, + .ambient = { .input_set = -1 }, + .diffuse = { .input_set = -1 }, + .specular = { .input_set = -1 }, + }, + { + .element_index = 5, // an index into mesh.triangles + .material = &material_material__15_1_material, + + .emission = { .input_set = -1 }, + .ambient = { .input_set = -1 }, + .diffuse = { .input_set = -1 }, + .specular = { .input_set = -1 }, + }, + { + .element_index = 3, // an index into mesh.triangles + .material = &material_material__16_1_material, + + .emission = { .input_set = -1 }, + .ambient = { .input_set = -1 }, + .diffuse = { .input_set = -1 }, + .specular = { .input_set = -1 }, + }, + { + .element_index = 2, // an index into mesh.triangles + .material = &material_material__17_1_material, + + .emission = { .input_set = -1 }, + .ambient = { .input_set = -1 }, + .diffuse = { .input_set = -1 }, + .specular = { .input_set = -1 }, + }, + { + .element_index = 4, // an index into mesh.triangles + .material = &material_material__18_1_material, + + .emission = { .input_set = -1 }, + .ambient = { .input_set = -1 }, + .diffuse = { .input_set = -1 }, + .specular = { .input_set = -1 }, + }, +}; + +instance_controller const instance_controllers_node_box001[] = { + { + .controller = &controller_geom_box001_skin1, + + .joint_node_indices = joint_node_indices_node_box001_geom_box001_skin1, + .joint_count = (sizeof (joint_node_indices_node_box001_geom_box001_skin1)) / (sizeof (int)), + + .instance_materials = instance_controller_instance_materials_node_box001_0, + .instance_materials_count = 6, + }, +}; + +instance_light const instance_lights_node_box001[] = { +}; + +channel const * const node_channels_node_box001[] = { +}; + +node const node_node_box001 = { + .parent_index = -1, + + .type = node_type::NODE, + + .transforms = transforms_node_box001, + .transforms_count = 0, + + .instance_geometries = instance_geometries_node_box001, + .instance_geometries_count = 0, + + .instance_controllers = instance_controllers_node_box001, + .instance_controllers_count = 1, + + .instance_lights = instance_lights_node_box001, + .instance_lights_count = 0, + + .channels = node_channels_node_box001, + .channels_count = 0, +}; + +transform const transforms_node_bone001[] = { + { + .type = transform_type::ROTATE, + .rotate = {1.32123e-06f, 1.0f, -1.49608e-06f, -90.0f}, + }, +}; + +instance_geometry const instance_geometries_node_bone001[] = { +}; + +instance_controller const instance_controllers_node_bone001[] = { +}; + +instance_light const instance_lights_node_bone001[] = { +}; + +channel const * const node_channels_node_bone001[] = { +}; + +node const node_node_bone001 = { + .parent_index = -1, + + .type = node_type::JOINT, + + .transforms = transforms_node_bone001, + .transforms_count = 1, + + .instance_geometries = instance_geometries_node_bone001, + .instance_geometries_count = 0, + + .instance_controllers = instance_controllers_node_bone001, + .instance_controllers_count = 0, + + .instance_lights = instance_lights_node_bone001, + .instance_lights_count = 0, + + .channels = node_channels_node_bone001, + .channels_count = 0, +}; + +transform const transforms_node_bone002[] = { + { + .type = transform_type::TRANSLATE, + .translate = {10.0f, 1.19209e-06f, 5.69993e-14f}, + }, + { + .type = transform_type::ROTATE, + .rotate = {0.0f, 0.0f, 1.0f, 5.00896e-06f}, + }, + { + .type = transform_type::ROTATE, + .rotate = {0.0f, 1.0f, 0.0f, -5.00896e-06f}, + }, + { + .type = transform_type::ROTATE, + .rotate = {1.0f, 0.0f, 0.0f, -5.00896e-06f}, + }, +}; + +instance_geometry const instance_geometries_node_bone002[] = { +}; + +instance_controller const instance_controllers_node_bone002[] = { +}; + +instance_light const instance_lights_node_bone002[] = { +}; + +channel const * const node_channels_node_bone002[] = { + &node_channel_node_bone002_rotationz_angle, +}; + +node const node_node_bone002 = { + .parent_index = 9, + + .type = node_type::JOINT, + + .transforms = transforms_node_bone002, + .transforms_count = 4, + + .instance_geometries = instance_geometries_node_bone002, + .instance_geometries_count = 0, + + .instance_controllers = instance_controllers_node_bone002, + .instance_controllers_count = 0, + + .instance_lights = instance_lights_node_bone002, + .instance_lights_count = 0, + + .channels = node_channels_node_bone002, + .channels_count = 1, +}; + node const * const nodes[] = { &node_node_environmentambientlight, &node_node_cube, @@ -1806,6 +2334,9 @@ node const * const nodes[] = { &node_node_geosphere, &node_node_light, &node_node_lightindicator, + &node_node_box001, + &node_node_bone001, + &node_node_bone002, }; inputs const inputs_list[] = {