Skip to content

Commit e3dc2ef

Browse files
stevkstevk
authored
Put sign inside parenthesis when using negative degrees (KhronosGroup#540)
1 parent 6434cef commit e3dc2ef

10 files changed

+31
-31
lines changed

‎Source/ModelGroup_SkinB.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ protected static partial class Nodes
1313
var colorInner = new Vector4(0.8f, 0.8f, 0.8f, 1.0f);
1414
var colorOuter = new Vector4(0.0f, 0.0f, 1.0f, 1.0f);
1515

16-
Matrix4x4 rotation = Matrix4x4.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90), 0.0f);
16+
Matrix4x4 rotation = Matrix4x4.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90.0f), 0.0f);
1717
var translationVectorJoint1 = new Vector3(0.0f, 0.0f, -0.6f);
1818
var translationVectorJoint0 = new Vector3(0.0f, 0.0f, 0.3f);
1919
Matrix4x4 matrixJoint1 = Matrix4x4.CreateTranslation(translationVectorJoint1);

‎Source/ModelGroup_SkinBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected static partial class Nodes
5151
}
5252
}
5353

54-
Matrix4x4 baseRotation = Matrix4x4.CreateFromYawPitchRoll(0.0f, -FloatMath.ToRadians(90), 0.0f);
54+
Matrix4x4 baseRotation = Matrix4x4.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(-90.0f), 0.0f);
5555
Quaternion jointRotation = Quaternion.CreateFromRotationMatrix(Matrix4x4.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(-30.0f), 0.0f));
5656
var translationVector = new Vector3(0.0f, 0.0f, vertexHeightOffset);
5757
var translationVectorJoint0 = new Vector3(0.0f, startHeight, 0.0f);

‎Source/ModelGroup_SkinE.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected static partial class Nodes
8181

8282
private static List<Runtime.Node> CreateJointsAndWeightsForCommonRoot(Runtime.Node nodePlane)
8383
{
84-
Matrix4x4 baseRotation = Matrix4x4.CreateFromYawPitchRoll(0.0f, -FloatMath.ToRadians(90), 0.0f);
84+
Matrix4x4 baseRotation = Matrix4x4.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(-90.0f), 0.0f);
8585
Matrix4x4 jointRotation = Matrix4x4.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(-15.0f), 0.0f);
8686
var translationVectorJoint3 = new Vector3(0.1875f, 0.0f, 0.25f);
8787
var translationVectorJoint2 = new Vector3(-0.1875f, 0.0f, 0.25f);
@@ -271,7 +271,7 @@ protected static partial class Nodes
271271

272272
private static List<Runtime.Node> CreateJointsAndWeightsForMultipleRoots(Runtime.Node nodePlane)
273273
{
274-
Matrix4x4 baseRotation = Matrix4x4.CreateFromYawPitchRoll(0.0f, -FloatMath.ToRadians(90), 0.0f);
274+
Matrix4x4 baseRotation = Matrix4x4.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(-90.0f), 0.0f);
275275
Matrix4x4 jointRotation = Matrix4x4.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(-15.0f), 0.0f);
276276
var translationVectorJoint3 = new Vector3(0.0f, 0.25f, 0.0f);
277277
var translationVectorJoint2 = new Vector3(0.0f, 0.0f, 0.25f);

‎Source/ModelGroups/Animation_Node.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,11 @@ void SetLinearSamplerForRotation(List<Property> properties, Runtime.AnimationCha
152152
},
153153
new[]
154154
{
155-
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90), 0.0f, 0.0f),
155+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90.0f), 0.0f, 0.0f),
156156
Quaternion.Identity,
157-
Quaternion.CreateFromYawPitchRoll(-FloatMath.ToRadians(90), 0.0f, 0.0f),
157+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(-90.0f), 0.0f, 0.0f),
158158
Quaternion.Identity,
159-
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90), 0.0f, 0.0f),
159+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90.0f), 0.0f, 0.0f),
160160
}
161161
);
162162

@@ -241,7 +241,7 @@ void CreateCubicSplineSamplerForRotation(List<Property> properties, Runtime.Anim
241241
new Runtime.CubicSplineAnimationSampler<Quaternion>.Key
242242
{
243243
InTangent = new Quaternion(0.0f, 0.0f, 0.0f, 0.0f),
244-
Value = Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90), 0.0f, 0.0f),
244+
Value = Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90.0f), 0.0f, 0.0f),
245245
OutTangent = new Quaternion(0.0f, 0.0f, 0.0f, 0.0f)
246246
},
247247
new Runtime.CubicSplineAnimationSampler<Quaternion>.Key
@@ -253,7 +253,7 @@ void CreateCubicSplineSamplerForRotation(List<Property> properties, Runtime.Anim
253253
new Runtime.CubicSplineAnimationSampler<Quaternion>.Key
254254
{
255255
InTangent = new Quaternion(0.0f, 0.0f, 0.0f, 0.0f),
256-
Value = Quaternion.CreateFromYawPitchRoll(-FloatMath.ToRadians(90), 0.0f, 0.0f),
256+
Value = Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(-90.0f), 0.0f, 0.0f),
257257
OutTangent = new Quaternion(0.0f, 0.0f, 0.0f, 0.0f)
258258
},
259259
new Runtime.CubicSplineAnimationSampler<Quaternion>.Key
@@ -265,7 +265,7 @@ void CreateCubicSplineSamplerForRotation(List<Property> properties, Runtime.Anim
265265
new Runtime.CubicSplineAnimationSampler<Quaternion>.Key
266266
{
267267
InTangent = new Quaternion(0.0f, 0.0f, 0.0f, 0.0f),
268-
Value = Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90), 0.0f, 0.0f),
268+
Value = Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90.0f), 0.0f, 0.0f),
269269
OutTangent = new Quaternion(0.0f, 0.0f, 0.0f, 0.0f)
270270
},
271271
}

‎Source/ModelGroups/Animation_NodeMisc.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@ void SetLinearSamplerForHorizontalRotation(Runtime.AnimationChannel channel)
122122
},
123123
new[]
124124
{
125-
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90), 0.0f, 0.0f),
125+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90.0f), 0.0f, 0.0f),
126126
Quaternion.Identity,
127-
Quaternion.CreateFromYawPitchRoll(-FloatMath.ToRadians(90), 0.0f, 0.0f),
127+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(-90.0f), 0.0f, 0.0f),
128128
Quaternion.Identity,
129-
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90), 0.0f, 0.0f),
129+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90.0f), 0.0f, 0.0f),
130130
}
131131
);
132132
}
@@ -145,11 +145,11 @@ void SetLinearSamplerForVerticalRotation(Runtime.AnimationChannel channel)
145145
},
146146
new[]
147147
{
148-
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90), 0.0f),
148+
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90.0f), 0.0f),
149149
Quaternion.Identity,
150-
Quaternion.CreateFromYawPitchRoll(0.0f, -FloatMath.ToRadians(90), 0.0f),
150+
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(-90.0f), 0.0f),
151151
Quaternion.Identity,
152-
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90), 0.0f),
152+
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90.0f), 0.0f),
153153
}
154154
);
155155
}
@@ -219,11 +219,11 @@ void SetLinearSamplerForRotationThatStartsAboveZero(Runtime.AnimationChannel cha
219219
},
220220
new[]
221221
{
222-
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90), 0.0f, 0.0f),
222+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90.0f), 0.0f, 0.0f),
223223
Quaternion.Identity,
224-
Quaternion.CreateFromYawPitchRoll(-FloatMath.ToRadians(90), 0.0f, 0.0f),
224+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(-90.0f), 0.0f, 0.0f),
225225
Quaternion.Identity,
226-
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90), 0.0f, 0.0f),
226+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90.0f), 0.0f, 0.0f),
227227
}
228228
);
229229
}

‎Source/ModelGroups/Animation_SamplerType.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ Model CreateModel(AnimationSampler.ComponentTypeEnum samplerOutputComponentType,
5858
},
5959
new[]
6060
{
61-
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90), 0.0f, 0.0f),
61+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90.0f), 0.0f, 0.0f),
6262
Quaternion.Identity,
63-
Quaternion.CreateFromYawPitchRoll(-FloatMath.ToRadians(90), 0.0f, 0.0f),
63+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(-90.0f), 0.0f, 0.0f),
6464
Quaternion.Identity,
65-
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90), 0.0f, 0.0f),
65+
Quaternion.CreateFromYawPitchRoll(FloatMath.ToRadians(90.0f), 0.0f, 0.0f),
6666
},
6767
outputComponentType: samplerOutputComponentType
6868
)

‎Source/ModelGroups/Animation_Skin.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Runtime.Animation CreateFoldingAnimation(Runtime.Node jointRootNode, List<Runtim
9999
}
100100

101101
Runtime.Node nodeCheck = jointRootNode;
102-
float pitchValue = -FloatMath.ToRadians(90);
102+
float pitchValue = FloatMath.ToRadians(-90.0f);
103103
var nodeList = new List<Runtime.Node>
104104
{
105105
jointRootNode,

‎Source/ModelGroups/Animation_SkinType.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void AnimateWithRotation(List<Runtime.Animation> animations, List<Runtime.Node>
7373
new[]
7474
{
7575
Quaternion.Identity,
76-
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90), 0.0f),
76+
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90.0f), 0.0f),
7777
Quaternion.Identity,
7878
}
7979
);

‎Source/ModelGroups/Instancing.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,20 @@ Model CreateModel(Action<List<Property>, List<Runtime.Node>, List<Runtime.Animat
7070

7171
var SamplerOutput = new[]
7272
{
73-
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90), 0.0f),
73+
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90.0f), 0.0f),
7474
Quaternion.Identity,
75-
Quaternion.CreateFromYawPitchRoll(0.0f, -FloatMath.ToRadians(90), 0.0f),
75+
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(-90.0f), 0.0f),
7676
Quaternion.Identity,
77-
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90), 0.0f),
77+
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90.0f), 0.0f),
7878
};
7979

8080
var SamplerOutputReverse = new[]
8181
{
82-
Quaternion.CreateFromYawPitchRoll(0.0f, -FloatMath.ToRadians(90), 0.0f),
82+
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(-90.0f), 0.0f),
8383
Quaternion.Identity,
84-
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90), 0.0f),
84+
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(90.0f), 0.0f),
8585
Quaternion.Identity,
86-
Quaternion.CreateFromYawPitchRoll(0.0f, -FloatMath.ToRadians(90), 0.0f),
86+
Quaternion.CreateFromYawPitchRoll(0.0f, FloatMath.ToRadians(-90.0f), 0.0f),
8787
};
8888

8989
Runtime.Texture CreateTexture(Runtime.Image image)

‎Source/Property.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,6 @@ internal enum PropertyName
164164
SamplerOutputComponentType,
165165
LeftPrimitiveIndices,
166166
RightPrimitiveIndices,
167-
Difference
167+
Difference,
168168
}
169169
}

0 commit comments

Comments
 (0)