Skip to content

Commit e0fc90f

Browse files
committed
Fix naming of Mat.TransposedTransformProj methods
1 parent 051e576 commit e0fc90f

File tree

2 files changed

+99
-27
lines changed

2 files changed

+99
-27
lines changed

src/Aardvark.Base/Math/Trafos/Matrix_auto.cs

+88-24
Original file line numberDiff line numberDiff line change
@@ -24332,17 +24332,21 @@ public static V2i TransposedTransformPos(this M33i m, V2i p)
2433224332
/// Transforms point p (v.Z is presumed 1.0) by transposed version of matrix m.
2433324333
/// Projective transform is performed. Perspective Division is performed.
2433424334
/// </summary>
24335-
public static V2i TransposedTransformProj(this M33i m, V2i p)
24335+
public static V2i TransposedTransformPosProj(this M33i m, V2i p)
2433624336
{
2433724337
var s = m.M02 * p.X + m.M12 * p.Y + m.M22;
2433824338
return TransposedTransformPos(m, p) * (1 / s);
2433924339
}
2434024340

24341+
[Obsolete("Use TransposedTransformPosProj instead.")]
24342+
public static V2i TransposedTransformProj(this M33i m, V2i p)
24343+
=> m.TransposedTransformPosProj(p);
24344+
2434124345
/// <summary>
2434224346
/// Transforms point p (v.Z is presumed 1.0) by transposed version of matrix m.
24343-
/// Projective transform is performed. Perspective Division is performed.
24347+
/// Projective transform is performed.
2434424348
/// </summary>
24345-
public static V3i TransposedTransformProjFull(this M33i m, V2i p)
24349+
public static V3i TransposedTransformPosProjFull(this M33i m, V2i p)
2434624350
{
2434724351
return new V3i(
2434824352
m.M00 * p.X + m.M10 * p.Y + m.M20,
@@ -24351,6 +24355,10 @@ public static V3i TransposedTransformProjFull(this M33i m, V2i p)
2435124355
);
2435224356
}
2435324357

24358+
[Obsolete("Use TransposedTransformPosProjFull instead.")]
24359+
public static V3i TransposedTransformProjFull(this M33i m, V2i p)
24360+
=> m.TransposedTransformPosProjFull(p);
24361+
2435424362
#endregion
2435524363

2435624364
#region Operations
@@ -27645,17 +27653,21 @@ public static V2l TransposedTransformPos(this M33l m, V2l p)
2764527653
/// Transforms point p (v.Z is presumed 1.0) by transposed version of matrix m.
2764627654
/// Projective transform is performed. Perspective Division is performed.
2764727655
/// </summary>
27648-
public static V2l TransposedTransformProj(this M33l m, V2l p)
27656+
public static V2l TransposedTransformPosProj(this M33l m, V2l p)
2764927657
{
2765027658
var s = m.M02 * p.X + m.M12 * p.Y + m.M22;
2765127659
return TransposedTransformPos(m, p) * (1 / s);
2765227660
}
2765327661

27662+
[Obsolete("Use TransposedTransformPosProj instead.")]
27663+
public static V2l TransposedTransformProj(this M33l m, V2l p)
27664+
=> m.TransposedTransformPosProj(p);
27665+
2765427666
/// <summary>
2765527667
/// Transforms point p (v.Z is presumed 1.0) by transposed version of matrix m.
27656-
/// Projective transform is performed. Perspective Division is performed.
27668+
/// Projective transform is performed.
2765727669
/// </summary>
27658-
public static V3l TransposedTransformProjFull(this M33l m, V2l p)
27670+
public static V3l TransposedTransformPosProjFull(this M33l m, V2l p)
2765927671
{
2766027672
return new V3l(
2766127673
m.M00 * p.X + m.M10 * p.Y + m.M20,
@@ -27664,6 +27676,10 @@ public static V3l TransposedTransformProjFull(this M33l m, V2l p)
2766427676
);
2766527677
}
2766627678

27679+
[Obsolete("Use TransposedTransformPosProjFull instead.")]
27680+
public static V3l TransposedTransformProjFull(this M33l m, V2l p)
27681+
=> m.TransposedTransformPosProjFull(p);
27682+
2766727683
#endregion
2766827684

2766927685
#region Operations
@@ -31171,17 +31187,21 @@ public static V2f TransposedTransformPos(this M33f m, V2f p)
3117131187
/// Transforms point p (v.Z is presumed 1.0) by transposed version of matrix m.
3117231188
/// Projective transform is performed. Perspective Division is performed.
3117331189
/// </summary>
31174-
public static V2f TransposedTransformProj(this M33f m, V2f p)
31190+
public static V2f TransposedTransformPosProj(this M33f m, V2f p)
3117531191
{
3117631192
var s = m.M02 * p.X + m.M12 * p.Y + m.M22;
3117731193
return TransposedTransformPos(m, p) * (1 / s);
3117831194
}
3117931195

31196+
[Obsolete("Use TransposedTransformPosProj instead.")]
31197+
public static V2f TransposedTransformProj(this M33f m, V2f p)
31198+
=> m.TransposedTransformPosProj(p);
31199+
3118031200
/// <summary>
3118131201
/// Transforms point p (v.Z is presumed 1.0) by transposed version of matrix m.
31182-
/// Projective transform is performed. Perspective Division is performed.
31202+
/// Projective transform is performed.
3118331203
/// </summary>
31184-
public static V3f TransposedTransformProjFull(this M33f m, V2f p)
31204+
public static V3f TransposedTransformPosProjFull(this M33f m, V2f p)
3118531205
{
3118631206
return new V3f(
3118731207
m.M00 * p.X + m.M10 * p.Y + m.M20,
@@ -31190,6 +31210,10 @@ public static V3f TransposedTransformProjFull(this M33f m, V2f p)
3119031210
);
3119131211
}
3119231212

31213+
[Obsolete("Use TransposedTransformPosProjFull instead.")]
31214+
public static V3f TransposedTransformProjFull(this M33f m, V2f p)
31215+
=> m.TransposedTransformPosProjFull(p);
31216+
3119331217
#endregion
3119431218

3119531219
#region Operations
@@ -34802,17 +34826,21 @@ public static V2d TransposedTransformPos(this M33d m, V2d p)
3480234826
/// Transforms point p (v.Z is presumed 1.0) by transposed version of matrix m.
3480334827
/// Projective transform is performed. Perspective Division is performed.
3480434828
/// </summary>
34805-
public static V2d TransposedTransformProj(this M33d m, V2d p)
34829+
public static V2d TransposedTransformPosProj(this M33d m, V2d p)
3480634830
{
3480734831
var s = m.M02 * p.X + m.M12 * p.Y + m.M22;
3480834832
return TransposedTransformPos(m, p) * (1 / s);
3480934833
}
3481034834

34835+
[Obsolete("Use TransposedTransformPosProj instead.")]
34836+
public static V2d TransposedTransformProj(this M33d m, V2d p)
34837+
=> m.TransposedTransformPosProj(p);
34838+
3481134839
/// <summary>
3481234840
/// Transforms point p (v.Z is presumed 1.0) by transposed version of matrix m.
34813-
/// Projective transform is performed. Perspective Division is performed.
34841+
/// Projective transform is performed.
3481434842
/// </summary>
34815-
public static V3d TransposedTransformProjFull(this M33d m, V2d p)
34843+
public static V3d TransposedTransformPosProjFull(this M33d m, V2d p)
3481634844
{
3481734845
return new V3d(
3481834846
m.M00 * p.X + m.M10 * p.Y + m.M20,
@@ -34821,6 +34849,10 @@ public static V3d TransposedTransformProjFull(this M33d m, V2d p)
3482134849
);
3482234850
}
3482334851

34852+
[Obsolete("Use TransposedTransformPosProjFull instead.")]
34853+
public static V3d TransposedTransformProjFull(this M33d m, V2d p)
34854+
=> m.TransposedTransformPosProjFull(p);
34855+
3482434856
#endregion
3482534857

3482634858
#region Operations
@@ -52309,17 +52341,21 @@ public static V3i TransposedTransformPos(this M44i m, V3i p)
5230952341
/// Transforms point p (v.W is presumed 1.0) by transposed version of matrix m.
5231052342
/// Projective transform is performed. Perspective Division is performed.
5231152343
/// </summary>
52312-
public static V3i TransposedTransformProj(this M44i m, V3i p)
52344+
public static V3i TransposedTransformPosProj(this M44i m, V3i p)
5231352345
{
5231452346
var s = m.M03 * p.X + m.M13 * p.Y + m.M23 * p.Z + m.M33;
5231552347
return TransposedTransformPos(m, p) * (1 / s);
5231652348
}
5231752349

52350+
[Obsolete("Use TransposedTransformPosProj instead.")]
52351+
public static V3i TransposedTransformProj(this M44i m, V3i p)
52352+
=> m.TransposedTransformPosProj(p);
52353+
5231852354
/// <summary>
5231952355
/// Transforms point p (v.W is presumed 1.0) by transposed version of matrix m.
52320-
/// Projective transform is performed. Perspective Division is performed.
52356+
/// Projective transform is performed.
5232152357
/// </summary>
52322-
public static V4i TransposedTransformProjFull(this M44i m, V3i p)
52358+
public static V4i TransposedTransformPosProjFull(this M44i m, V3i p)
5232352359
{
5232452360
return new V4i(
5232552361
m.M00 * p.X + m.M10 * p.Y + m.M20 * p.Z + m.M30,
@@ -52329,6 +52365,10 @@ public static V4i TransposedTransformProjFull(this M44i m, V3i p)
5232952365
);
5233052366
}
5233152367

52368+
[Obsolete("Use TransposedTransformPosProjFull instead.")]
52369+
public static V4i TransposedTransformProjFull(this M44i m, V3i p)
52370+
=> m.TransposedTransformPosProjFull(p);
52371+
5233252372
#endregion
5233352373

5233452374
#region Operations
@@ -56221,17 +56261,21 @@ public static V3l TransposedTransformPos(this M44l m, V3l p)
5622156261
/// Transforms point p (v.W is presumed 1.0) by transposed version of matrix m.
5622256262
/// Projective transform is performed. Perspective Division is performed.
5622356263
/// </summary>
56224-
public static V3l TransposedTransformProj(this M44l m, V3l p)
56264+
public static V3l TransposedTransformPosProj(this M44l m, V3l p)
5622556265
{
5622656266
var s = m.M03 * p.X + m.M13 * p.Y + m.M23 * p.Z + m.M33;
5622756267
return TransposedTransformPos(m, p) * (1 / s);
5622856268
}
5622956269

56270+
[Obsolete("Use TransposedTransformPosProj instead.")]
56271+
public static V3l TransposedTransformProj(this M44l m, V3l p)
56272+
=> m.TransposedTransformPosProj(p);
56273+
5623056274
/// <summary>
5623156275
/// Transforms point p (v.W is presumed 1.0) by transposed version of matrix m.
56232-
/// Projective transform is performed. Perspective Division is performed.
56276+
/// Projective transform is performed.
5623356277
/// </summary>
56234-
public static V4l TransposedTransformProjFull(this M44l m, V3l p)
56278+
public static V4l TransposedTransformPosProjFull(this M44l m, V3l p)
5623556279
{
5623656280
return new V4l(
5623756281
m.M00 * p.X + m.M10 * p.Y + m.M20 * p.Z + m.M30,
@@ -56241,6 +56285,10 @@ public static V4l TransposedTransformProjFull(this M44l m, V3l p)
5624156285
);
5624256286
}
5624356287

56288+
[Obsolete("Use TransposedTransformPosProjFull instead.")]
56289+
public static V4l TransposedTransformProjFull(this M44l m, V3l p)
56290+
=> m.TransposedTransformPosProjFull(p);
56291+
5624456292
#endregion
5624556293

5624656294
#region Operations
@@ -60322,17 +60370,21 @@ public static V3f TransposedTransformPos(this M44f m, V3f p)
6032260370
/// Transforms point p (v.W is presumed 1.0) by transposed version of matrix m.
6032360371
/// Projective transform is performed. Perspective Division is performed.
6032460372
/// </summary>
60325-
public static V3f TransposedTransformProj(this M44f m, V3f p)
60373+
public static V3f TransposedTransformPosProj(this M44f m, V3f p)
6032660374
{
6032760375
var s = m.M03 * p.X + m.M13 * p.Y + m.M23 * p.Z + m.M33;
6032860376
return TransposedTransformPos(m, p) * (1 / s);
6032960377
}
6033060378

60379+
[Obsolete("Use TransposedTransformPosProj instead.")]
60380+
public static V3f TransposedTransformProj(this M44f m, V3f p)
60381+
=> m.TransposedTransformPosProj(p);
60382+
6033160383
/// <summary>
6033260384
/// Transforms point p (v.W is presumed 1.0) by transposed version of matrix m.
60333-
/// Projective transform is performed. Perspective Division is performed.
60385+
/// Projective transform is performed.
6033460386
/// </summary>
60335-
public static V4f TransposedTransformProjFull(this M44f m, V3f p)
60387+
public static V4f TransposedTransformPosProjFull(this M44f m, V3f p)
6033660388
{
6033760389
return new V4f(
6033860390
m.M00 * p.X + m.M10 * p.Y + m.M20 * p.Z + m.M30,
@@ -60342,6 +60394,10 @@ public static V4f TransposedTransformProjFull(this M44f m, V3f p)
6034260394
);
6034360395
}
6034460396

60397+
[Obsolete("Use TransposedTransformPosProjFull instead.")]
60398+
public static V4f TransposedTransformProjFull(this M44f m, V3f p)
60399+
=> m.TransposedTransformPosProjFull(p);
60400+
6034560401
#endregion
6034660402

6034760403
#region Operations
@@ -64551,17 +64607,21 @@ public static V3d TransposedTransformPos(this M44d m, V3d p)
6455164607
/// Transforms point p (v.W is presumed 1.0) by transposed version of matrix m.
6455264608
/// Projective transform is performed. Perspective Division is performed.
6455364609
/// </summary>
64554-
public static V3d TransposedTransformProj(this M44d m, V3d p)
64610+
public static V3d TransposedTransformPosProj(this M44d m, V3d p)
6455564611
{
6455664612
var s = m.M03 * p.X + m.M13 * p.Y + m.M23 * p.Z + m.M33;
6455764613
return TransposedTransformPos(m, p) * (1 / s);
6455864614
}
6455964615

64616+
[Obsolete("Use TransposedTransformPosProj instead.")]
64617+
public static V3d TransposedTransformProj(this M44d m, V3d p)
64618+
=> m.TransposedTransformPosProj(p);
64619+
6456064620
/// <summary>
6456164621
/// Transforms point p (v.W is presumed 1.0) by transposed version of matrix m.
64562-
/// Projective transform is performed. Perspective Division is performed.
64622+
/// Projective transform is performed.
6456364623
/// </summary>
64564-
public static V4d TransposedTransformProjFull(this M44d m, V3d p)
64624+
public static V4d TransposedTransformPosProjFull(this M44d m, V3d p)
6456564625
{
6456664626
return new V4d(
6456764627
m.M00 * p.X + m.M10 * p.Y + m.M20 * p.Z + m.M30,
@@ -64571,6 +64631,10 @@ public static V4d TransposedTransformProjFull(this M44d m, V3d p)
6457164631
);
6457264632
}
6457364633

64634+
[Obsolete("Use TransposedTransformPosProjFull instead.")]
64635+
public static V4d TransposedTransformProjFull(this M44d m, V3d p)
64636+
=> m.TransposedTransformPosProjFull(p);
64637+
6457464638
#endregion
6457564639

6457664640
#region Operations

src/Aardvark.Base/Math/Trafos/Matrix_template.cs

+11-3
Original file line numberDiff line numberDiff line change
@@ -1825,23 +1825,31 @@ public static __vmsub1type__ TransposedTransformPos(this __nmtype__ m, __vmsub1t
18251825
/// Transforms point p (v.__fields[m-1]__ is presumed 1.0) by transposed version of matrix m.
18261826
/// Projective transform is performed. Perspective Division is performed.
18271827
/// </summary>
1828-
public static __vmsub1type__ TransposedTransformProj(this __nmtype__ m, __vmsub1type__ p)
1828+
public static __vmsub1type__ TransposedTransformPosProj(this __nmtype__ m, __vmsub1type__ p)
18291829
{
18301830
var s = /*# mfields.Take(msub1).ForEach((fr, r) => { */m.M__r____msub1__ * p.__fr__/*#}, add);*/ + m.M__msub1____msub1__;
18311831
return TransposedTransformPos(m, p) * (1 / s);
18321832
}
18331833

1834+
[Obsolete("Use TransposedTransformPosProj instead.")]
1835+
public static __vmsub1type__ TransposedTransformProj(this __nmtype__ m, __vmsub1type__ p)
1836+
=> m.TransposedTransformPosProj(p);
1837+
18341838
/// <summary>
18351839
/// Transforms point p (v.__fields[m-1]__ is presumed 1.0) by transposed version of matrix m.
1836-
/// Projective transform is performed. Perspective Division is performed.
1840+
/// Projective transform is performed.
18371841
/// </summary>
1838-
public static __vmtype__ TransposedTransformProjFull(this __nmtype__ m, __vmsub1type__ p)
1842+
public static __vmtype__ TransposedTransformPosProjFull(this __nmtype__ m, __vmsub1type__ p)
18391843
{
18401844
return new __vmtype__(/*# m.ForEach(s => { */
18411845
/*# mfields.Take(msub1).ForEach((fr, r) => { */m.M__r____s__ * p.__fr__/*#}, add);*/ + m.M__msub1____s__/*#}, comma);*/
18421846
);
18431847
}
18441848

1849+
[Obsolete("Use TransposedTransformPosProjFull instead.")]
1850+
public static __vmtype__ TransposedTransformProjFull(this __nmtype__ m, __vmsub1type__ p)
1851+
=> m.TransposedTransformPosProjFull(p);
1852+
18451853
//# } // n != m
18461854
//# } // m > 2
18471855
//# if (m == n + 1) {

0 commit comments

Comments
 (0)