Skip to content

Commit a17177d

Browse files
committed
Updated script with new API
1 parent 8cd2786 commit a17177d

6 files changed

+9
-8
lines changed

Diff for: AGXUnity/Sensor/LidarSurfaceMaterialBrdfExplicitMaterial.cs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public class LidarSurfaceMaterialBrdfExplicit : LidarSurfaceMaterialDefinition
99
// TODO configuration of this is unimplemented, currently only the default form.
1010
// Hints for development: https://www.algoryx.se/documentation/complete/agx/tags/latest/doc/UserManual/source/agxsensor.html#explicit-brdf-surface
1111
protected RtBrdfExplicitMaterial m_material = null;
12-
public override RtMaterialInstance GetRtMaterialInstance() => m_material?.ToMaterialInstance();
1312
public override RtSurfaceMaterial GetRtMaterial() => m_material;
1413

1514
public override void Destroy()

Diff for: AGXUnity/Sensor/LidarSurfaceMaterialDefinition.cs

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ namespace AGXUnity.Sensor
66
[HelpURL( "https://us.download.algoryx.se/AGXUnity/documentation/current/editor_interface.html#sensors" )]
77
public abstract class LidarSurfaceMaterialDefinition : ScriptAsset
88
{
9-
abstract public RtMaterialInstance GetRtMaterialInstance();
109
abstract public RtSurfaceMaterial GetRtMaterial();
1110
}
1211
}

Diff for: AGXUnity/Sensor/LidarSurfaceMaterialGgxAndOrenNayar.cs

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ public float DiffuseReflectivity
8989
}
9090

9191
protected RtGgxAndOrenNayarMaterial Native = null;
92-
public override RtMaterialInstance GetRtMaterialInstance() => Native?.ToMaterialInstance();
9392
public override RtSurfaceMaterial GetRtMaterial() => Native;
9493

9594
public override void Destroy()

Diff for: AGXUnity/Sensor/LidarSurfaceMaterialLambertianOpaque.cs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public float Reflectivity
2323
}
2424

2525
protected RtLambertianOpaqueMaterial Native = null;
26-
public override RtMaterialInstance GetRtMaterialInstance() => Native?.ToMaterialInstance();
2726
public override RtSurfaceMaterial GetRtMaterial() => Native;
2827

2928
public override void Destroy()

Diff for: AGXUnity/Sensor/SensorEnvironment.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public AmbientMaterial AmbientMaterial
7676
{
7777
m_ambientMaterial = value;
7878
if ( Native != null ) {
79-
var nativeMat = m_ambientMaterial?.GetInitialized<AmbientMaterial>()?.Native.ToMaterialInstance();
79+
RtMaterialInstance nativeMat = m_ambientMaterial?.GetInitialized<AmbientMaterial>()?.Native;
8080
if ( nativeMat == null )
8181
nativeMat = new RtMaterialInstance(); // Create a null instance to set unset the ambient mat
8282
Native.getScene().setMaterial( nativeMat );
@@ -193,10 +193,10 @@ private RtShapeInstance CreateShapeInstance( RtShape rtShape, Quaternion rotatio
193193
{
194194
RtMaterialInstance rtMaterialInstance = null;
195195
if ( material != null )
196-
rtMaterialInstance = material.GetRtMaterialInstance();
196+
rtMaterialInstance = material.GetRtMaterial();
197197

198198
Profiler.BeginSample( "CreateShapeInstance" );
199-
RtInstanceData data = new RtInstanceData(rtMaterialInstance ?? InternalDefaultMaterial.ToMaterialInstance(), (RtEntityId)(++m_currentEntityId));
199+
RtInstanceData data = new RtInstanceData(rtMaterialInstance ?? InternalDefaultMaterial, (RtEntityId)(++m_currentEntityId));
200200
RtShapeInstance shapeInstance = RtShapeInstance.create(Native.getScene(), rtShape, data);
201201

202202
shapeInstance.setTransform(
@@ -334,7 +334,7 @@ protected override bool Initialize()
334334
if ( AmbientMaterial != null ) {
335335
var ambMat = AmbientMaterial.GetInitialized<AmbientMaterial>().Native;
336336

337-
Native.getScene().setMaterial( ambMat.ToMaterialInstance() );
337+
Native.getScene().setMaterial( ambMat );
338338
}
339339

340340
FindValidComponents<MeshFilter>( true ).ForEach( RegisterMeshfilter );

Diff for: Tests/Runtime/LidarTests.cs

+5
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,14 @@ private LidarSurfaceMaterialLambertianOpaque AddLambertianMaterial( GameObject o
3838
return material;
3939
}
4040

41+
4142
[OneTimeSetUp]
4243
public void SetupLidarScene()
4344
{
45+
Simulation.Instance.LogEnabled = true;
46+
Simulation.Instance.LogPath = "/home/filip/dev/AGXUnity/build/ubuntu-22.04/Tests/agx.log";
47+
//agxSensor.agxSensorSWIG.rgl_configure_logging( 0, "/home/filip/dev/AGXUnity/build/ubuntu-22.04/Tests/rgl.log", true );
48+
4449
CreateShape<Box>( new Vector3( 3, 0, 3 ) );
4550
CreateShape<Sphere>( new Vector3( -3, 0, 3 ) );
4651
CreateShape<Cylinder>( new Vector3( -3, 0, -3 ) );

0 commit comments

Comments
 (0)