v1.0.2

Author: The Senate

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.2] - 2020-12-07
+### Fixed
+- Removed benchmark's dependency on angle files entirely. 
+
 ## [1.0.1] - 2020-12-06
 ### Changed
 - Logs and benchmarks now have timestamps prefixed to the filename.

README.md

@@ -109,7 +109,7 @@ The directory where the app searches for angle lists. Lists are expected to have
 #### Logs
 
 If enabled in the settings, log files will be saved in this folder.
-The log filename will be `<timestamp> log.txt`. Will be overwritten on each execution.
+The log filename will be `<timestamp> log.txt`.
 
 #### Output
 

XRD-TAF/Assets/Scripts/DataHandler.cs

@@ -349,7 +349,7 @@ public void Compute(Preset preset, Logger logger, PerformanceReport report, bool
         _shaderAdapter = _builder
             .SetLogger(logger)
             .SetWriteFactors(write)
-            .SetPerformanceReport(report)    // TODO: see if report is generated correctly, otherwise use report as return.
+            .SetPerformanceReport(report)
             .SetProperties(preset)
             .SetAngles(angles)
             .AutoSetShader()

XRD-TAF/Assets/Scripts/adapter/IntegratedModeAdapter.cs

@@ -49,8 +49,9 @@ public IntegratedModeAdapter(
             Preset preset, 
             bool writeFactors, 
             Logger customLogger,
-            double[] angles
-        ) : base(shader, preset, writeFactors, customLogger, angles)
+            double[] angles,
+            PerformanceReport performanceReport
+        ) : base(shader, preset, writeFactors, customLogger, angles, performanceReport)
         {
             if (logger == null) SetLogger(customLogger);
             logger.Log(Logger.EventType.Class, $"{CLASS_NAME} created.");

XRD-TAF/Assets/Scripts/adapter/PlaneModeAdapter.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using model;
+using tests;
 using UnityEngine;
 using util;
 using static tests.PerformanceReport.TimeInterval;
@@ -42,8 +43,9 @@ public PlaneModeAdapter(
             ComputeShader shader, 
             Preset preset,
             bool writeFactors,
-            Logger customLogger
-        ) : base(shader, preset, writeFactors, customLogger)
+            Logger customLogger,
+            PerformanceReport performanceReport
+        ) : base(shader, preset, writeFactors, customLogger, null, performanceReport)
         {
             if (logger == null) SetLogger(customLogger);
             logger.Log(Logger.EventType.Class, $"{nameof(PlaneModeAdapter)} created.");

XRD-TAF/Assets/Scripts/adapter/PointModeAdapter.cs

@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using model;
+using tests;
 using UnityEngine;
 using util;
 using static tests.PerformanceReport.TimeInterval;
@@ -39,8 +40,8 @@ private static string Context(string methodName, string className = CLASS_NAME)
         #region Constructors
 
         public PointModeAdapter(ComputeShader shader, Preset preset, bool writeFactors, Logger customLogger,
-            double[] angles) 
-            : base(shader, preset, writeFactors, customLogger, angles)
+            double[] angles, PerformanceReport performanceReport) 
+            : base(shader, preset, writeFactors, customLogger, angles, performanceReport)
         {
             if (logger == null) SetLogger(customLogger);
             logger.Log(Logger.EventType.Class, $"{nameof(PointModeAdapter)} created.");

XRD-TAF/Assets/Scripts/adapter/ShaderAdapter.cs

@@ -14,7 +14,7 @@ public abstract class ShaderAdapter
         #region Fields
 
         protected Logger logger;
-        protected PerformanceReport stopwatch;
+        internal PerformanceReport stopwatch;
         protected readonly bool writeFactors;
 
         private protected readonly ComputeShader shader;
@@ -49,19 +49,21 @@ protected ShaderAdapter(
             Preset preset, 
             bool writeFactors, 
             Logger logger = null, 
-            double[] angles = null
+            double[] angles = null,
+            PerformanceReport performanceReport = null
             )
         {
             this.shader = shader;
             properties = preset.properties;
             metadata = preset.metadata;
             this.writeFactors = writeFactors;
             if (logger != null) SetLogger(logger);
-            if (stopwatch == null)
+            if (performanceReport == null)
             {
                 var info = PerformanceReport.InputInfo.FromPreset(preset);
                 stopwatch = new PerformanceReport(info);
             }
+            else stopwatch = performanceReport;
             if (angles != null) this.angles = angles;
 
             stopwatch.Start(PerformanceReport.TimeInterval.Category.Total);

XRD-TAF/Assets/Scripts/adapter/ShaderAdapterBuilder.cs

@@ -20,7 +20,7 @@ public class ShaderAdapterBuilder
         private Preset _preset;
         private static Dictionary<AbsorptionProperties.Mode, ComputeShader> _shaderMapping;
         private Logger _logger;
-        private PerformanceReport _report;    // TODO: use in ShaderAdapter.
+        private PerformanceReport _report;
         private double[] _angles;
 
         #endregion
@@ -41,13 +41,13 @@ public ShaderAdapter Build()
             switch (_preset.properties.absorption.mode)
             {
                 case AbsorptionProperties.Mode.Point:
-                    adapter = new PointModeAdapter(_shader, _preset, _writeFactors, _logger, _angles);
+                    adapter = new PointModeAdapter(_shader, _preset, _writeFactors, _logger, _angles, _report);
                     break;
                 case AbsorptionProperties.Mode.Area:
-                    adapter = new PlaneModeAdapter(_shader, _preset, _writeFactors, _logger);
+                    adapter = new PlaneModeAdapter(_shader, _preset, _writeFactors, _logger, _report);
                     break;
                 case AbsorptionProperties.Mode.Integrated:
-                    adapter = new IntegratedModeAdapter(_shader, _preset, _writeFactors, _logger, _angles);
+                    adapter = new IntegratedModeAdapter(_shader, _preset, _writeFactors, _logger, _angles, _report);
                     break;
             }
 

XRD-TAF/Assets/Scripts/tests/PerformanceReport.cs

@@ -16,7 +16,6 @@ public class PerformanceReport
         private InputInfo _inputInfo;
         private LinkedList<TimeInterval> _total, _shader, _buffer, _io;
         private Stack<TimeInterval> _intervals;
-        // TODO: use stack or deque for nested intervals.
 
         public readonly List<string> headRow = new List<string> {
             "time-total", "time-shader", "time-buffer", "time-io",          // time

XRD-TAF/Assets/Scripts/ui/MainPanel.cs

@@ -48,10 +48,11 @@ public class MainPanel : MonoBehaviour {
       public InputField fieldRayOffsetY;
       public Dropdown dropdownRayProfile;
 
-      public Preset selectedPreset;    // use if a saved preset was selected (incl. default).
       internal Preset preset;     // use for current state of properties.
+      
+      // TODO: implement
+      public Preset selectedPreset;    // use if a saved preset was selected (incl. default).
       private bool presetHasChanged;
-      // TODO: remember to deep-copy the preset!
 
       // for component-wise / group-wise selection of case-specific input fields.
       public GameObject inputGroupDetector;
@@ -135,7 +136,7 @@ void SetComponent(string text, ref Vector2 variable, int position)
 
       public void FillFromPreset(Preset source)
       {
-         FillFromPreset(source.metadata);   // not necessary for
+         FillFromPreset(source.metadata);
          FillFromPreset(source.properties.absorption);
          FillFromPreset(source.properties.angle);
          FillFromPreset(source.properties.detector);

XRD-TAF/Presets/benchmark.json

@@ -13,7 +13,7 @@
 			"angleCount": 30,
 			"angleEnd": 90,
 			"angleStart": 0,
-			"pathToAngleFile": "(0,180,1.0)"
+			"pathToAngleFile": null
 		},
 		"detector": {
 			"distToSample": 240.18,

XRD-TAF/ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: DefaultCompany
-  productName: UnityStuff
+  productName: XRD-TAF
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -126,7 +126,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1
+  bundleVersion: 1.0.2
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -588,6 +588,7 @@ PlayerSettings:
   il2cppCompilerConfiguration: {}
   managedStrippingLevel: {}
   incrementalIl2cppBuild: {}
+  suppressCommonWarnings: 1
   allowUnsafeCode: 0
   useDeterministicCompilation: 1
   additionalIl2CppArgs: