diff --git a/models/curve_interpolation/curve_interpolation.DAE b/models/curve_interpolation/curve_interpolation.DAE index eeb1d4f..64889c2 100755 --- a/models/curve_interpolation/curve_interpolation.DAE +++ b/models/curve_interpolation/curve_interpolation.DAE @@ -1,792 +1,792 @@ - - - - - bilbo - OpenCOLLADA for 3ds Max; Version: 1.6; Revision: 68 - file:///C:/cygwin/home/bilbo/d3d10/models/curve_interpolation/curve_interpolation.max - - 2026-01-25T13:40:01 - 2026-01-25T13:40:01 - - Z_UP - - - - - - - - 0 0 0 1 - - - 0.6705883 0.5843138 1 1 - - - 0.6705883 0.5843138 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.5803922 1 0.9647059 1 - - - 0.5803922 1 0.9647059 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.6509804 1 0.5803922 1 - - - 0.6509804 1 0.5803922 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.9333334 1 0.5647059 1 - - - 0.9333334 1 0.5647059 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.7686275 0.5803922 1 - - - 1 0.7686275 0.5803922 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.5803922 0.5803922 1 - - - 1 0.5803922 0.5803922 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.8980392 0.6039216 0.8431373 1 - - - 0.8980392 0.6039216 0.8431373 1 - - - 1 1 1 1 - - - 10 - - - 0 0 0 1 - - - 1 1 1 1 - - - 1 - - - - - - - - - - - 0.1098039 0.5843137 0.6941176 1 - - - 0.1098039 0.5843137 0.6941176 1 - - - 1 1 1 1 - - - 10 - - - 0 0 0 1 - - - 1 1 1 1 - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -0.5 -0.5 0 0.5 -0.5 0 -0.5 0.5 0 0.5 0.5 0 -0.5 -0.5 1 0.5 -0.5 1 -0.5 0.5 1 0.5 0.5 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 1 0 0 1 0 0 1 0 0 1 0 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 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 1 0 1 1 0 0 0 0 1 0 0 0 1 0 1 1 0 0 0 0 1 0 0 0 1 0 1 1 0 0 0 0 1 0 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 5 10 11 5 10 11 4 11 10 0 8 8

- - - - - -

1 12 12 3 13 13 7 14 15 7 14 15 5 15 14 1 12 12

- - - - - -

3 16 16 2 17 17 6 18 19 6 18 19 7 19 18 3 16 16

- - - - - -

2 20 20 0 21 21 4 22 23 4 22 23 6 23 22 2 20 20

- - - - - - - 10 0 0 9.807853 1.950903 0 9.238795 3.826834 0 8.314696 5.555702 0 7.071068 7.071068 0 5.555702 8.314696 0 3.826834 9.238795 0 1.950904 9.807853 0 7.54979e-7 10 0 -1.950902 9.807853 0 -3.826833 9.238796 0 -5.555702 8.314696 0 -7.071068 7.071068 0 -8.314696 5.555702 0 -9.238796 3.826833 0 -9.807854 1.950901 0 -10 -3.25841e-6 0 -9.807852 -1.950907 0 -9.238793 -3.826839 0 -8.314693 -5.555707 0 -7.071063 -7.071073 0 -5.555696 -8.3147 0 -3.826827 -9.238798 0 -1.950894 -9.807855 0 9.65599e-6 -10 0 1.950913 -9.807851 0 3.826845 -9.238791 0 5.555712 -8.31469 0 7.071077 -7.071059 0 8.314704 -5.555691 0 9.238801 -3.826821 0 9.807856 -1.950888 0 - - - - - - - - - - 0 0 1 0 0 1 0 0 1 0 0 0.9999999 0 0 1 0 0 0.9999999 0 0 1 0 0 0.9999999 0 0 1 0 0 1 0 0 0.9999999 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0.9999999 0 0 1 0 0 0.9999999 0 0 1 0 0 0.9999999 0 0 0.9999999 0 0 0.9999999 0 0 1 0 0 0.9999999 0 0 1 0 0 1 0 0 0.9999999 0 0 1 0 0 1 0 0 0.9999999 0 0 0.9999999 0 0 1 - - - - - - - - - - 0.5975444 0.9903928 -0.25 0.691341 0.9619401 -0.25 0.7777845 0.9157352 -0.25 0.8535529 0.8535539 -0.25 0.9157345 0.7777857 -0.25 0.9619396 0.6913422 -0.25 0.9903926 0.5975457 -0.25 1 0.5000005 -0.25 0.9903927 0.4024553 -0.25 0.9619399 0.3086587 -0.25 0.915735 0.2222152 -0.25 0.8535537 0.1464469 -0.25 0.7777854 0.08426532 -0.25 0.6913419 0.03806034 -0.25 0.5975454 0.009607404 -0.25 0.5000002 0 -0.25 0.402455 0.009607315 -0.25 0.3086584 0.03806019 -0.25 0.2222149 0.08426517 -0.25 0.1464466 0.1464466 -0.25 0.08426517 0.2222149 -0.25 0.03806019 0.3086583 -0.25 0.009607345 0.4024549 -0.25 0 0.5 -0.25 0.009607345 0.5975451 -0.25 0.03806022 0.6913417 -0.25 0.08426517 0.7777851 -0.25 0.1464466 0.8535534 -0.25 0.2222148 0.9157348 -0.25 0.3086582 0.9619398 -0.25 0.4024548 0.9903927 -0.25 0.5 1 -0.25 - - - - - - - - - - - - - - - -

0 0 31 1 1 30 2 2 29 2 2 29 3 3 28 4 4 27 0 0 31 2 2 29 4 4 27 4 4 27 5 5 26 6 6 25 6 6 25 7 7 24 8 8 23 4 4 27 6 6 25 8 8 23 0 0 31 4 4 27 8 8 23 8 8 23 9 9 22 10 10 21 10 10 21 11 11 20 12 12 19 8 8 23 10 10 21 12 12 19 12 12 19 13 13 18 14 14 17 14 14 17 15 15 16 16 16 15 12 12 19 14 14 17 16 16 15 8 8 23 12 12 19 16 16 15 0 0 31 8 8 23 16 16 15 16 16 15 17 17 14 18 18 13 18 18 13 19 19 12 20 20 11 16 16 15 18 18 13 20 20 11 20 20 11 21 21 10 22 22 9 22 22 9 23 23 8 24 24 7 20 20 11 22 22 9 24 24 7 16 16 15 20 20 11 24 24 7 0 0 31 16 16 15 24 24 7 24 24 7 25 25 6 26 26 5 26 26 5 27 27 4 28 28 3 24 24 7 26 26 5 28 28 3 0 0 31 24 24 7 28 28 3 28 28 3 29 29 2 30 30 1 0 0 31 28 28 3 30 30 1 31 31 0 0 0 31 30 30 1

- - - - - - - -7.071065 -7.071065 0 7.071065 -7.071065 0 -7.071065 7.071065 0 7.071065 7.071065 0 - - - - - - - - - - 0 0 1 0 0 0.9999999 0 0 0.9999999 0 0 1 - - - - - - - - - - 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 1 1 0 - - - - - - - - - - - - - - - -

2 0 6 0 1 4 3 2 7 1 3 5 3 2 7 0 1 4

- - - - - - 14.14213 - 14.14213 - 1 - 1 - 1 - 1 - 1 - - - - - - - - - - 0 0 0 - - - - - - - - - - - 10 0 0 - - - - - - - - - - - - - - - 1 - 1 - 1 - 1 - - - - - - - - - - - - - - 1 - 1 - 1 - 1 - - - - - 0 0 0.01 - 0 0 -1 -44.99999 - - - - - - - - - - 1 - 1 - 1 - 1 - - - - - - - - - 0 1.666667 3.333333 5 - - - - - - - - 10 -10 10 -10 - - - - - - - - -0.3332306 10 1.111167 -10 2.778333 10 4.4445 -9.219337 - - - - - - - - - 0.5555 10 2.222167 -10 3.888333 10 4.000208 -8.594958 - - - - - - - - - BEZIER BEZIER BEZIER BEZIER - - - - - - - - -0.8333334 0.8333334 2.5 4.166667 - - - - - - - - -10.05776 10.05852 -9.941484 10.05852 - - - - - - - - -1.166264 -10.05776 0.2778334 10.05852 1.9445 -9.941484 3.611667 10.05852 - - - - - - - - - -0.2783333 -10.05776 1.388833 10.05852 3.0555 -9.941484 4.499598 10.05852 - - - - - - - - - BEZIER BEZIER BEZIER BEZIER - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + bilbo + OpenCOLLADA for 3ds Max; Version: 1.6; Revision: 68 + file:///C:/cygwin/home/bilbo/d3d10/models/curve_interpolation/curve_interpolation.max + + 2026-01-26T20:45:12 + 2026-01-26T20:45:12 + + Z_UP + + + + + + + + 0 0 0 1 + + + 0.6705883 0.5843138 1 1 + + + 0.6705883 0.5843138 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.5803922 1 0.9647059 1 + + + 0.5803922 1 0.9647059 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.6509804 1 0.5803922 1 + + + 0.6509804 1 0.5803922 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.9333334 1 0.5647059 1 + + + 0.9333334 1 0.5647059 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.7686275 0.5803922 1 + + + 1 0.7686275 0.5803922 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.5803922 0.5803922 1 + + + 1 0.5803922 0.5803922 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.8980392 0.6039216 0.8431373 1 + + + 0.8980392 0.6039216 0.8431373 1 + + + 1 1 1 1 + + + 10 + + + 0 0 0 1 + + + 1 1 1 1 + + + 1 + + + + + + + + + + + 0.1098039 0.5843137 0.6941176 1 + + + 0.1098039 0.5843137 0.6941176 1 + + + 1 1 1 1 + + + 10 + + + 0 0 0 1 + + + 1 1 1 1 + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.5 -0.5 0 0.5 -0.5 0 -0.5 0.5 0 0.5 0.5 0 -0.5 -0.5 1 0.5 -0.5 1 -0.5 0.5 1 0.5 0.5 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 1 0 0 1 0 0 1 0 0 1 0 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 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 1 0 1 1 0 0 0 0 1 0 0 0 1 0 1 1 0 0 0 0 1 0 0 0 1 0 1 1 0 0 0 0 1 0 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 5 10 11 5 10 11 4 11 10 0 8 8

+ + + + + +

1 12 12 3 13 13 7 14 15 7 14 15 5 15 14 1 12 12

+ + + + + +

3 16 16 2 17 17 6 18 19 6 18 19 7 19 18 3 16 16

+ + + + + +

2 20 20 0 21 21 4 22 23 4 22 23 6 23 22 2 20 20

+ + + + + + + 10 0 0 9.807853 1.950903 0 9.238795 3.826834 0 8.314696 5.555702 0 7.071068 7.071068 0 5.555702 8.314696 0 3.826834 9.238795 0 1.950904 9.807853 0 7.54979e-7 10 0 -1.950902 9.807853 0 -3.826833 9.238796 0 -5.555702 8.314696 0 -7.071068 7.071068 0 -8.314696 5.555702 0 -9.238796 3.826833 0 -9.807854 1.950901 0 -10 -3.25841e-6 0 -9.807852 -1.950907 0 -9.238793 -3.826839 0 -8.314693 -5.555707 0 -7.071063 -7.071073 0 -5.555696 -8.3147 0 -3.826827 -9.238798 0 -1.950894 -9.807855 0 9.65599e-6 -10 0 1.950913 -9.807851 0 3.826845 -9.238791 0 5.555712 -8.31469 0 7.071077 -7.071059 0 8.314704 -5.555691 0 9.238801 -3.826821 0 9.807856 -1.950888 0 + + + + + + + + + + 0 0 1 0 0 1 0 0 1 0 0 0.9999999 0 0 1 0 0 0.9999999 0 0 1 0 0 0.9999999 0 0 1 0 0 1 0 0 0.9999999 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0.9999999 0 0 1 0 0 0.9999999 0 0 1 0 0 0.9999999 0 0 0.9999999 0 0 0.9999999 0 0 1 0 0 0.9999999 0 0 1 0 0 1 0 0 0.9999999 0 0 1 0 0 1 0 0 0.9999999 0 0 0.9999999 0 0 1 + + + + + + + + + + 0.5975444 0.9903928 -0.25 0.691341 0.9619401 -0.25 0.7777845 0.9157352 -0.25 0.8535529 0.8535539 -0.25 0.9157345 0.7777857 -0.25 0.9619396 0.6913422 -0.25 0.9903926 0.5975457 -0.25 1 0.5000005 -0.25 0.9903927 0.4024553 -0.25 0.9619399 0.3086587 -0.25 0.915735 0.2222152 -0.25 0.8535537 0.1464469 -0.25 0.7777854 0.08426532 -0.25 0.6913419 0.03806034 -0.25 0.5975454 0.009607404 -0.25 0.5000002 0 -0.25 0.402455 0.009607315 -0.25 0.3086584 0.03806019 -0.25 0.2222149 0.08426517 -0.25 0.1464466 0.1464466 -0.25 0.08426517 0.2222149 -0.25 0.03806019 0.3086583 -0.25 0.009607345 0.4024549 -0.25 0 0.5 -0.25 0.009607345 0.5975451 -0.25 0.03806022 0.6913417 -0.25 0.08426517 0.7777851 -0.25 0.1464466 0.8535534 -0.25 0.2222148 0.9157348 -0.25 0.3086582 0.9619398 -0.25 0.4024548 0.9903927 -0.25 0.5 1 -0.25 + + + + + + + + + + + + + + + +

0 0 31 1 1 30 2 2 29 2 2 29 3 3 28 4 4 27 0 0 31 2 2 29 4 4 27 4 4 27 5 5 26 6 6 25 6 6 25 7 7 24 8 8 23 4 4 27 6 6 25 8 8 23 0 0 31 4 4 27 8 8 23 8 8 23 9 9 22 10 10 21 10 10 21 11 11 20 12 12 19 8 8 23 10 10 21 12 12 19 12 12 19 13 13 18 14 14 17 14 14 17 15 15 16 16 16 15 12 12 19 14 14 17 16 16 15 8 8 23 12 12 19 16 16 15 0 0 31 8 8 23 16 16 15 16 16 15 17 17 14 18 18 13 18 18 13 19 19 12 20 20 11 16 16 15 18 18 13 20 20 11 20 20 11 21 21 10 22 22 9 22 22 9 23 23 8 24 24 7 20 20 11 22 22 9 24 24 7 16 16 15 20 20 11 24 24 7 0 0 31 16 16 15 24 24 7 24 24 7 25 25 6 26 26 5 26 26 5 27 27 4 28 28 3 24 24 7 26 26 5 28 28 3 0 0 31 24 24 7 28 28 3 28 28 3 29 29 2 30 30 1 0 0 31 28 28 3 30 30 1 31 31 0 0 0 31 30 30 1

+ + + + + + + -7.071065 -7.071065 0 7.071065 -7.071065 0 -7.071065 7.071065 0 7.071065 7.071065 0 + + + + + + + + + + 0 0 1 0 0 0.9999999 0 0 0.9999999 0 0 1 + + + + + + + + + + 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 1 0 1 1 0 + + + + + + + + + + + + + + + +

2 0 6 0 1 4 3 2 7 1 3 5 3 2 7 0 1 4

+ + + + + + 14.14213 + 14.14213 + 1 + 1 + 1 + 1 + 1 + + + + + + + + + + 0 0 0 + + + + + + + + + + + 10 -1.14258e-7 0 + + + + + + + + + + + + + + + 1 + 1 + 1 + 1 + + + + + + + + + + + + + + 1 + 1 + 1 + 1 + + + + + 0 0 0.01 + 0 0 -1 -44.99999 + + + + + + + + + + 1 + 1 + 1 + 1 + + + + + + + + + 0 1.666667 3.333333 5 + + + + + + + + 10 -10 10 -10 + + + + + + + + -0.3332306 10 1.111167 -10 2.778333 10 4.4445 -9.219337 + + + + + + + + + 0.5555 10 2.222167 -10 3.888333 10 4.000208 -8.594958 + + + + + + + + + BEZIER BEZIER BEZIER BEZIER + + + + + + + + -0.8333334 0.8333334 2.5 4.166667 + + + + + + + + -10.05776 10.05852 -9.941484 10.05852 + + + + + + + + -1.166264 -10.05776 0.2778334 10.05852 1.9445 -9.941484 3.611667 10.05852 + + + + + + + + + -0.2783333 -10.05776 1.388833 10.05852 3.0555 -9.941484 4.499598 10.05852 + + + + + + + + + BEZIER BEZIER BEZIER BEZIER + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/models/skinned_cube/skinned_cube.DAE b/models/skinned_cube/skinned_cube.DAE index 542a014..eb3a1c7 100755 --- a/models/skinned_cube/skinned_cube.DAE +++ b/models/skinned_cube/skinned_cube.DAE @@ -6,24 +6,27 @@ OpenCOLLADA for 3ds Max; Version: 1.6; Revision: 68 file:///C:/cygwin/home/bilbo/d3d10/models/skinned_cube/skinned_cube.max - 2026-01-24T13:01:29 - 2026-01-24T13:01:29 + 2026-01-25T14:06:19 + 2026-01-25T14:06:19 Z_UP - + - + + + 0 0 0 1 + - 0.1019608 0.6941176 0.1019608 1 + 0.5882353 0.5882353 1 1 - 0.1019608 0.6941176 0.1019608 1 + 0.5882353 0.5882353 1 1 - 1 1 1 1 + 0 0 0 1 10 @@ -31,20 +34,339 @@ 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 + + + - - + + + + + + + + + + + + + + + + + @@ -71,9 +393,9 @@ - 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 1 0 1 1 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 - + @@ -83,26 +405,43 @@ - + -

0 0 25 2 1 27 3 2 26 3 2 26 1 3 24 0 0 25 4 4 24 5 5 25 7 6 27 7 6 27 6 7 26 4 4 24 0 8 12 1 9 13 9 10 15 9 10 15 8 11 14 0 8 12 8 11 14 9 10 15 13 12 17 13 12 17 12 13 16 8 11 14 12 13 16 13 12 17 17 14 19 17 14 19 16 15 18 12 13 16 16 15 18 17 14 19 21 16 21 21 16 21 20 17 20 16 15 18 20 17 20 21 16 21 5 18 23 5 18 23 4 19 22 20 17 20 1 20 0 3 21 1 10 22 3 10 22 3 9 23 2 1 20 0 9 23 2 10 22 3 14 24 5 14 24 5 13 25 4 9 23 2 13 25 4 14 24 5 18 26 7 18 26 7 17 27 6 13 25 4 17 27 6 18 26 7 22 28 9 22 28 9 21 29 8 17 27 6 21 29 8 22 28 9 7 30 11 7 30 11 5 31 10 21 29 8 3 32 12 2 33 13 11 34 15 11 34 15 10 35 14 3 32 12 10 35 14 11 34 15 15 36 17 15 36 17 14 37 16 10 35 14 14 37 16 15 36 17 19 38 19 19 38 19 18 39 18 14 37 16 18 39 18 19 38 19 23 40 21 23 40 21 22 41 20 18 39 18 22 41 20 23 40 21 6 42 23 6 42 23 7 43 22 22 41 20 2 44 0 0 45 1 8 46 3 8 46 3 11 47 2 2 44 0 11 47 2 8 46 3 12 48 5 12 48 5 15 49 4 11 47 2 15 49 4 12 48 5 16 50 7 16 50 7 19 51 6 15 49 4 19 51 6 16 50 7 20 52 9 20 52 9 23 53 8 19 51 6 23 53 8 20 52 9 4 54 11 4 54 11 6 55 10 23 53 8

+

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

 - - - - 10 - 10 - 20 - 1 - 1 - 5 - 1 - - - @@ -165,7 +504,12 @@ #node-Bone001 - + + + + + + diff --git a/models/skinned_cube/skinned_cube.max b/models/skinned_cube/skinned_cube.max index ab2ecc4..26054a4 100755 Binary files a/models/skinned_cube/skinned_cube.max and b/models/skinned_cube/skinned_cube.max differ diff --git a/src/collada_scene.cpp b/src/collada_scene.cpp index d955f38..3646875 100644 --- a/src/collada_scene.cpp +++ b/src/collada_scene.cpp @@ -21,6 +21,12 @@ namespace collada_scene { ID3D10EffectMatrixVariable * g_pViewVariable = NULL; ID3D10EffectMatrixVariable * g_pProjectionVariable = NULL; + ID3D10EffectVectorVariable * g_pEmissionVariable = NULL; + ID3D10EffectVectorVariable * g_pAmbientVariable = NULL; + ID3D10EffectVectorVariable * g_pDiffuseVariable = NULL; + ID3D10EffectVectorVariable * g_pSpecularVariable = NULL; + ID3D10EffectScalarVariable * g_pShininessVariable = NULL; + static inline DXGI_FORMAT dxgi_format(input_format format) { switch (format) { @@ -90,7 +96,7 @@ namespace collada_scene { bd.Usage = D3D10_USAGE_IMMUTABLE; bd.ByteWidth = dwResSize; - bd.BindFlags = D3D10_BIND_VERTEX_BUFFER; + bd.BindFlags = D3D10_BIND_INDEX_BUFFER; bd.CPUAccessFlags = 0; bd.MiscFlags = 0; initData.pSysMem = pData; @@ -188,6 +194,12 @@ namespace collada_scene { g_pViewVariable = g_pEffect->GetVariableByName("View")->AsMatrix(); g_pProjectionVariable = g_pEffect->GetVariableByName("Projection")->AsMatrix(); + g_pEmissionVariable = g_pEffect->GetVariableByName("Emission")->AsVector(); + g_pAmbientVariable = g_pEffect->GetVariableByName("Ambient")->AsVector(); + g_pDiffuseVariable = g_pEffect->GetVariableByName("Diffuse")->AsVector(); + g_pSpecularVariable = g_pEffect->GetVariableByName("Specular")->AsVector(); + g_pShininessVariable = g_pEffect->GetVariableByName("Shininess")->AsScalar(); + return S_OK; } @@ -232,13 +244,42 @@ namespace collada_scene { } } + static inline void SetMaterial(effect const& effect) + { + switch (effect.type) { + case effect_type::BLINN: + g_pEmissionVariable->SetFloatVector((float *)&effect.blinn.emission.color.x); + g_pAmbientVariable->SetFloatVector((float *)&effect.blinn.ambient.color.x); + g_pDiffuseVariable->SetFloatVector((float *)&effect.blinn.diffuse.color.x); + g_pSpecularVariable->SetFloatVector((float *)&effect.blinn.specular.color.x); + g_pShininessVariable->SetFloat(effect.blinn.shininess); + break; + case effect_type::LAMBERT: + g_pEmissionVariable->SetFloatVector((float *)&effect.lambert.emission.color.x); + g_pAmbientVariable->SetFloatVector((float *)&effect.lambert.ambient.color.x); + g_pDiffuseVariable->SetFloatVector((float *)&effect.lambert.diffuse.color.x); + break; + case effect_type::PHONG: + g_pEmissionVariable->SetFloatVector((float *)&effect.phong.emission.color.x); + g_pAmbientVariable->SetFloatVector((float *)&effect.phong.ambient.color.x); + g_pDiffuseVariable->SetFloatVector((float *)&effect.phong.diffuse.color.x); + g_pSpecularVariable->SetFloatVector((float *)&effect.phong.specular.color.x); + g_pShininessVariable->SetFloat(effect.phong.shininess); + break; + case effect_type::CONSTANT: + g_pEmissionVariable->SetFloatVector((float *)&effect.constant.color.x); + break; + default: + break; + } + } + void RenderGeometries(scene_state const& state, instance_geometry const * const instance_geometries, int const instance_geometries_count) { for (int i = 0; i < instance_geometries_count; i++) { instance_geometry const &instance_geometry = instance_geometries[i]; - mesh const& mesh = instance_geometry.geometry->mesh; UINT strides[1] = { 3 * 3 * 4 }; @@ -249,8 +290,10 @@ namespace collada_scene { D3D10_TECHNIQUE_DESC techDesc; g_pTechniqueBlinn->GetDesc(&techDesc); - for (int j = 0; j < mesh.triangles_count; j++) { - triangles const& triangles = mesh.triangles[j]; + for (int j = 0; j < instance_geometry.instance_materials_count; j++) { + instance_material const& instance_material = instance_geometry.instance_materials[j]; + triangles const& triangles = mesh.triangles[instance_material.element_index]; + SetMaterial(*instance_material.material->effect); g_pTechniqueBlinn->GetPassByIndex(0)->Apply(0); g_pd3dDevice->IASetInputLayout(state.pVertexLayouts[triangles.inputs_index]); diff --git a/src/effect/collada_scene.fx b/src/effect/collada_scene.fx index 8c8cbe0..c683dde 100644 --- a/src/effect/collada_scene.fx +++ b/src/effect/collada_scene.fx @@ -9,6 +9,15 @@ cbuffer cbMultiplePerFrame matrix World; }; +cbuffer cbPerMaterial +{ + float4 Emission; + float4 Ambient; + float4 Diffuse; + float4 Specular; + float Shininess; +}; + struct VS_INPUT { float3 Pos : POSITION; @@ -39,8 +48,12 @@ PS_INPUT VS(VS_INPUT input) float4 PS(PS_INPUT input) : SV_Target { + float4 color = Emission + Diffuse * 1.0 + Specular * 0.0; + + return float4(color.xyz, 1); + //return float4(input.Normal * 0.5 + 0.5, 1); - return float4(input.Tex.xy, 0, 1); + //return float4(input.Tex.xy, 0, 1); } BlendState DisableBlending diff --git a/src/main.cpp b/src/main.cpp index ad5a2da..542e868 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1821,7 +1821,7 @@ void Render(float t, float dt) g_pd3dDevice->ClearDepthStencilView(g_pDepthStencilView, D3D10_CLEAR_DEPTH, 1.0f, 0); // render - RenderModel(t); + //RenderModel(t); const float ClearColorZero[4] = { 0.0f, 0.0f, 0.0f, 1.0f }; ID3D10RenderTargetView * RenderTargets[] = { @@ -1830,19 +1830,19 @@ void Render(float t, float dt) }; g_pd3dDevice->OMSetRenderTargets(2, RenderTargets, g_pDepthStencilView); g_pd3dDevice->ClearRenderTargetView(g_pRenderTargetViewTexture[0], ClearColorZero); - RenderMeshStatic(cube::node_0.mesh, t); + //RenderMeshStatic(cube::node_0.mesh, t); //RenderBloom(); //print("%f\n", t); //RenderVolume(t); //RenderVolumeMesh(); - RenderFont(dt); - //collada::Render(t); collada_scene::Render(curve_interpolation::descriptor, g_SceneState); + RenderFont(dt); + // present g_pSwapChain->Present(0, 0); }