storytold/LiveScan3D
2
0
Fork 0
mirror of https://github.com/storytold/LiveScan3D.git synced 2026-10-09 00:09:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up

Browse Source
This commit is contained in:
Christopher Remde
2020-07-08 14:15:49 +02:00
parent 1544abd276
commit 2b15ed0f5b
4 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LiveScanServer/KinectServer.cs
+1 -1
View File
@@ -234,7 +234,7 @@ namespace KinectServer
} }
/// <summary> /// <summary>
/// Send temporal Sync Data to all client /// Send temporal Sync Data to all clients
/// </summary> /// </summary>
public void SendTemporalSyncData() public void SendTemporalSyncData()
{ {
LiveScanServer/KinectSocket.cs
-12
View File
@@ -220,18 +220,6 @@ namespace KinectServer
currentTempSyncState = eTempSyncConfig.STANDALONE; currentTempSyncState = eTempSyncConfig.STANDALONE;
} }
//MARKED FOR DELETION
//if(currentTempSyncState == eTempSyncConfig.SUBORDINATE && confirmSubStarted == 1)
//{
//}
//else if(currentTempSyncState == eTempSyncConfig.SUBORDINATE && confirmSubStarted == 0)
//{
// bSubStarted = false;
// eSubInitialized?.Invoke();
//}
UpdateSocketState(); UpdateSocketState();
} }
src/LiveScanClient/azureKinectCapture.cpp
+1 -4
View File
@@ -56,10 +56,7 @@ bool AzureKinectCapture::Initialize(bool asMaster, bool asSubordinate, int syncO
{ {
config.wired_sync_mode = K4A_WIRED_SYNC_MODE_SUBORDINATE; config.wired_sync_mode = K4A_WIRED_SYNC_MODE_SUBORDINATE;
//Sets the offset on subordinate devices. Should be a multiple of 160, each subordinate having a different multiplier in ascending order. //Sets the offset on subordinate devices. Should be a multiple of 160, each subordinate having a different multiplier in ascending order.
//This is very important, as it avoids firing the Kinects Lasers at the same time. //This is very important, as it avoids firing the Kinects lasers at the same time.
config.subordinate_delay_off_master_usec = 0;
config.subordinate_delay_off_master_usec = 160 * syncOffsetMultiplier; config.subordinate_delay_off_master_usec = 160 * syncOffsetMultiplier;
} }
src/LiveScanClient/frameFileWriterReader.cpp
+2 -1
View File
@@ -94,7 +94,8 @@ void FrameFileWriterReader::writeFrame(std::vector<Point3s> points, std::vector<
FILE *f = m_pFileHandle; FILE *f = m_pFileHandle;
int nPoints = static_cast<int>(points.size()); int nPoints = static_cast<int>(points.size());
//fprintf(f, "n_points= %d\nframe_timestamp= %d\n", nPoints, getRecordingTimeMilliseconds());
//The Timestamp is generated by the Kinect instead of the system. If temporal Sync is enabled, Master and Subordinate have a synced timestamp
fprintf(f, "n_points= %d\nframe_timestamp= %d\n", nPoints, timestamp); fprintf(f, "n_points= %d\nframe_timestamp= %d\n", nPoints, timestamp);
if (nPoints > 0) if (nPoints > 0)
{ {