diff --git a/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/contentModel.xml b/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/contentModel.xml
index ffbf356d656374052747329501d8018ab3271f5d..2915ca2b6909c7752c11f6aae2af4d862dac5289 100644
--- a/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/contentModel.xml
+++ b/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/contentModel.xml
@@ -13,17 +13,17 @@
</e>
<e p="Scripts" t="Include">
<e p="ApplyPostProcessingEffect.cs" t="Include" />
- <e p="baseScript.cs" t="Include" />
<e p="Calibration.cs" t="Include" />
<e p="createLink.cs" t="Include" />
<e p="DummyCalibrator.cs" t="Include" />
- <e p="followMe.cs" t="Include" />
+ <e p="followTheToken.cs" t="Include" />
<e p="Grayscale.shader" t="Include" />
<e p="imgTexture.cs" t="Include" />
+ <e p="InitialPosition.cs" t="Include" />
<e p="LensDistortion.cs" t="Include" />
<e p="LensDistortion.shader" t="Include" />
<e p="linerender.cs" t="Include" />
- <e p="place.cs" t="Include" />
+ <e p="PlaceHolderTokenHandler.cs" t="Include" />
<e p="SamplerCalibrator.cs" t="Include" />
<e p="video.cs" t="Include" />
<e p="ZoomText.cs" t="Include" />
diff --git a/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/workspace.xml b/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/workspace.xml
index db5b147ee38ae69a3ef16f00093f10ab52dcd81a..18ad428781bb90b70d2fa91c28c72c00fd74e9b2 100644
--- a/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/workspace.xml
+++ b/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/workspace.xml
@@ -2,19 +2,21 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="de51e123-0d6f-4730-8617-fa4b79e06847" name="Default" comment="">
- <change afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/ApplyPostProcessingEffect.cs" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/ApplyPostProcessingEffect.cs.meta" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/Grayscale.shader" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/Grayscale.shader.meta" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs.meta" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.shader" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.shader.meta" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/baseScript.cs" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/baseScript.cs.meta" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/contentModel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Unity-Optitrack-projector-calibration/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/Assets/Calibration/Scripts/Calibration.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/Calibration.cs" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Calibration/Scripts/SamplerCalibrator.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/SamplerCalibrator.cs" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/Assets/Calibration/Scripts/baseScript.cs" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/Assets/Calibration/Scripts/baseScript.cs.meta" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/Assets/Calibration/Scripts/createLink.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/createLink.cs" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/Assets/Calibration/Scripts/followMe.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/followTheToken.cs" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/Assets/Calibration/Scripts/followMe.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Calibration/Scripts/followTheToken.cs.meta" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/Assets/Calibration/Scripts/place.cs" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/Assets/Calibration/Scripts/place.cs.meta" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/Assets/calibrationScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/calibrationScene.unity" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/ProjectSettings/GraphicsSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/GraphicsSettings.asset" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -24,277 +26,253 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
- <splitter split-orientation="horizontal" split-proportion="0.5">
- <split-first>
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="place.cs" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/place.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="16" selection-start-line="16" selection-end-line="16" />
- <folding>
- <marker date="1525278018782" expanded="false" signature="6:78" ph="..." />
- <marker date="1525278018782" expanded="true" signature="115:236" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="165:172" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="227:234" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ZoomText.cs" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/ZoomText.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="544">
- <caret line="34" column="1" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
- <folding>
- <marker date="1525278018777" expanded="false" signature="6:78" ph="..." />
- <marker date="1525278018777" expanded="true" signature="118:691" ph="{...}" />
- <marker date="1525278018777" expanded="true" signature="248:351" ph="{...}" />
- <marker date="1525278018777" expanded="true" signature="406:413" ph="{...}" />
- <marker date="1525278018777" expanded="true" signature="451:689" ph="{...}" />
- <marker date="1525278018777" expanded="true" signature="487:686" ph="{...}" />
- <marker date="1525278018777" expanded="true" signature="503:590" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="followMe.cs" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followMe.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="51">
- <caret line="5" column="6" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
- <folding>
- <marker date="1527596492505" expanded="false" signature="6:78" ph="..." />
- <marker date="1527596492505" expanded="true" signature="118:875" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="215:230" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="285:300" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="339:873" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="380:686" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="429:623" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="640:651" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="732:870" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="LensDistortion.cs" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="16" column="24" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
- <folding>
- <marker date="1527755616403" expanded="false" signature="6:78" ph="..." />
- <marker date="1527755616403" expanded="true" signature="123:1144" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="247:309" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="334:375" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="401:563" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="643:702" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="723:790" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="811:878" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="899:966" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="987:1054" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="1075:1142" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="SamplerCalibrator.cs" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/SamplerCalibrator.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="35" selection-start-line="35" selection-end-line="35" />
- <folding>
- <marker date="1527756477254" expanded="true" signature="6:140" ph="..." />
- <marker date="1527756477254" expanded="true" signature="188:4119" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="697:1812" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="873:1769" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="920:1629" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="1044:1134" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="1646:1759" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="1870:2217" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="1917:2115" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="2157:2211" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="2248:3629" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3201:3265" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3681:4117" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3757:4088" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3817:4078" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3907:3974" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3995:4064" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="baseScript.cs" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/baseScript.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
- <folding>
- <marker date="1527689140585" expanded="false" signature="6:78" ph="..." />
- <marker date="1527689140585" expanded="true" signature="120:241" ph="{...}" />
- <marker date="1527689140585" expanded="true" signature="170:177" ph="{...}" />
- <marker date="1527689140585" expanded="true" signature="232:239" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Calibration.cs" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/Calibration.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="505">
- <caret line="139" column="32" selection-start-line="139" selection-start-column="32" selection-end-line="139" selection-end-column="32" />
- <folding>
- <marker date="1527755616388" expanded="false" signature="6:178" ph="..." />
- <marker date="1527755616388" expanded="true" signature="204:20976" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="247:6627" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="343:2374" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="827:926" ph="/* The output camera matrix(A)[fx 0 cx; 0 fy cy; 0 0 1] ... */" />
- <marker date="1527755616388" expanded="true" signature="971:1526" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="1005:1512" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="1595:1998" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="2066:2364" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="2407:3802" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="2563:3258" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="3295:3417" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="3329:3403" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="3454:3576" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="3488:3562" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="3639:3791" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="3835:5508" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="4043:4565" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="4606:4762" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="4791:4854" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="4883:4946" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="4975:5038" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="5067:5130" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="5159:5222" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="5251:5314" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="5343:5406" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="5435:5498" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="5766:5866" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="5792:5856" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="5903:6003" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="5929:5993" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="6041:6223" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="6067:6131" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="6148:6213" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="6378:6621" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="6697:7037" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="7011:7031" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="7043:7782" ph="/* Original method http://docs.opencv.org/2.4/modules/calib3d/doc/camera_calibration_and_3d_reconstruction.html ... */" />
- <marker date="1527755616388" expanded="true" signature="7903:8263" ph="/* N Points in space(x,y,z) ... */" />
- <marker date="1527755616388" expanded="true" signature="8316:8588" ph="/* N*S points on the image plane(u,v) matching the N points in space, where ... */" />
- <marker date="1527755616388" expanded="true" signature="9395:11726" ph="/* Different flags: ... */" />
- <marker date="1527755616388" expanded="true" signature="11726:16068" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="11819:11908" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="12184:12669" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="13335:14284" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="13524:14274" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="13767:14028" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="14049:14259" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="14768:15945" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="15973:16062" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="16107:16303" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="16408:16456" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="16507:16942" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="16583:16914" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="16643:16904" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="16733:16800" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="16821:16890" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="16994:17429" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="17070:17401" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="17130:17391" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="17220:17287" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="17308:17377" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="17436:19054" ph="/// Estimates intrinsic camera parameters and extrinsic parameters for each of the views ... " />
- <marker date="1527755616388" expanded="true" signature="19428:20974" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="19854:20968" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="20018:20920" ph="{...}" />
- <marker date="1527755616388" expanded="true" signature="20550:20906" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="linerender.cs" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/linerender.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="272">
- <caret line="16" column="9" selection-start-line="16" selection-start-column="9" selection-end-line="16" selection-end-column="9" />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="video.cs" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/video.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state>
- <folding>
- <marker date="1525278018783" expanded="false" signature="6:125" ph="..." />
- <marker date="1525278018783" expanded="true" signature="317:326" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="365:634" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="443:631" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="502:563" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="687:931" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="765:928" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="799:860" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </split-first>
- <split-second>
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="LensDistortion.cs" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="561">
- <caret line="35" column="24" selection-start-line="35" selection-start-column="24" selection-end-line="35" selection-end-column="24" />
- <folding>
- <marker date="1527755616403" expanded="false" signature="6:78" ph="..." />
- <marker date="1527755616403" expanded="true" signature="123:1144" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="247:309" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="334:375" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="401:563" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="643:702" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="723:790" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="811:878" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="899:966" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="987:1054" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="1075:1142" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </split-second>
- </splitter>
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file leaf-file-name="ZoomText.cs" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/ZoomText.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="544">
+ <caret line="34" column="1" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
+ <folding>
+ <marker date="1525278018777" expanded="false" signature="6:78" ph="..." />
+ <marker date="1525278018777" expanded="true" signature="118:691" ph="{...}" />
+ <marker date="1525278018777" expanded="true" signature="248:351" ph="{...}" />
+ <marker date="1525278018777" expanded="true" signature="406:413" ph="{...}" />
+ <marker date="1525278018777" expanded="true" signature="451:689" ph="{...}" />
+ <marker date="1525278018777" expanded="true" signature="487:686" ph="{...}" />
+ <marker date="1525278018777" expanded="true" signature="503:590" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="followTheToken.cs" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followTheToken.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="476">
+ <caret line="30" column="43" selection-start-line="30" selection-start-column="43" selection-end-line="30" selection-end-column="43" />
+ <folding>
+ <marker date="1527596492505" expanded="false" signature="6:78" ph="..." />
+ <marker date="1527596492505" expanded="true" signature="118:875" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="215:230" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="285:300" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="339:873" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="380:686" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="429:623" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="640:651" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="732:870" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="InitialPosition.cs" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/InitialPosition.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="442">
+ <caret line="26" selection-start-line="26" selection-end-line="26" />
+ <folding>
+ <marker date="1527869838651" expanded="true" signature="6:78" ph="..." />
+ <marker date="1527869838651" expanded="true" signature="125:592" ph="{...}" />
+ <marker date="1527869838651" expanded="true" signature="240:338" ph="{...}" />
+ <marker date="1527869838651" expanded="true" signature="393:400" ph="{...}" />
+ <marker date="1527869838651" expanded="true" signature="430:495" ph="{...}" />
+ <marker date="1527869838651" expanded="true" signature="525:590" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="LensDistortion.cs" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="510">
+ <caret line="32" selection-start-line="32" selection-end-line="32" />
+ <folding>
+ <marker date="1527784511985" expanded="false" signature="6:78" ph="..." />
+ <marker date="1527784511985" expanded="true" signature="123:1144" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="247:309" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="334:375" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="401:563" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="643:702" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="723:790" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="811:878" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="899:966" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="987:1054" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="1075:1142" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="calib" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Assets/calib">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="357">
+ <caret line="21" column="7" selection-start-line="21" selection-start-column="7" selection-end-line="21" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="PlaceHolderTokenHandler.cs" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/PlaceHolderTokenHandler.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="272">
+ <caret line="18" column="20" lean-forward="true" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+ <folding>
+ <marker date="1527873639068" expanded="false" signature="6:78" ph="..." />
+ <marker date="1527873639068" expanded="true" signature="125:445" ph="{...}" />
+ <marker date="1527873639068" expanded="true" signature="215:381" ph="{...}" />
+ <marker date="1527873639068" expanded="true" signature="436:443" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Calibration.cs" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/Calibration.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="709">
+ <caret line="139" column="32" selection-start-line="139" selection-start-column="32" selection-end-line="139" selection-end-column="32" />
+ <folding>
+ <marker date="1527755616388" expanded="false" signature="6:178" ph="..." />
+ <marker date="1527755616388" expanded="true" signature="204:20976" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="247:6627" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="343:2374" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="827:926" ph="/* The output camera matrix(A)[fx 0 cx; 0 fy cy; 0 0 1] ... */" />
+ <marker date="1527755616388" expanded="true" signature="971:1526" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="1005:1512" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="1595:1998" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="2066:2364" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="2407:3802" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="2563:3258" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="3295:3417" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="3329:3403" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="3454:3576" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="3488:3562" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="3639:3791" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="3835:5508" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="4043:4565" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="4606:4762" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="4791:4854" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="4883:4946" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="4975:5038" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="5067:5130" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="5159:5222" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="5251:5314" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="5343:5406" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="5435:5498" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="5766:5866" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="5792:5856" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="5903:6003" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="5929:5993" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="6041:6223" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="6067:6131" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="6148:6213" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="6378:6621" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="6697:7037" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="7011:7031" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="7043:7782" ph="/* Original method http://docs.opencv.org/2.4/modules/calib3d/doc/camera_calibration_and_3d_reconstruction.html ... */" />
+ <marker date="1527755616388" expanded="true" signature="7903:8263" ph="/* N Points in space(x,y,z) ... */" />
+ <marker date="1527755616388" expanded="true" signature="8316:8588" ph="/* N*S points on the image plane(u,v) matching the N points in space, where ... */" />
+ <marker date="1527755616388" expanded="true" signature="9395:11726" ph="/* Different flags: ... */" />
+ <marker date="1527755616388" expanded="true" signature="11726:16068" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="11819:11908" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="12184:12669" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="13335:14284" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="13524:14274" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="13767:14028" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="14049:14259" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="14768:15945" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="15973:16062" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="16107:16303" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="16408:16456" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="16507:16942" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="16583:16914" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="16643:16904" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="16733:16800" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="16821:16890" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="16994:17429" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="17070:17401" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="17130:17391" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="17220:17287" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="17308:17377" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="17436:19054" ph="/// Estimates intrinsic camera parameters and extrinsic parameters for each of the views ... " />
+ <marker date="1527755616388" expanded="true" signature="19428:20974" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="19854:20968" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="20018:20920" ph="{...}" />
+ <marker date="1527755616388" expanded="true" signature="20550:20906" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="createLink.cs" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/createLink.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="306">
+ <caret line="24" column="15" lean-forward="true" selection-start-line="24" selection-start-column="15" selection-end-line="24" selection-end-column="15" />
+ <folding>
+ <marker date="1527856155417" expanded="false" signature="6:98" ph="..." />
+ <marker date="1527856155417" expanded="true" signature="140:906" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="279:312" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="332:345" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="385:707" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="426:704" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="477:561" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="587:663" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="765:903" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="linerender.cs" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/linerender.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="272">
+ <caret line="16" column="9" selection-start-line="16" selection-start-column="9" selection-end-line="16" selection-end-column="9" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="video.cs" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/video.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state>
+ <folding>
+ <marker date="1525278018783" expanded="false" signature="6:125" ph="..." />
+ <marker date="1525278018783" expanded="true" signature="317:326" ph="{...}" />
+ <marker date="1525278018783" expanded="true" signature="365:634" ph="{...}" />
+ <marker date="1525278018783" expanded="true" signature="443:631" ph="{...}" />
+ <marker date="1525278018783" expanded="true" signature="502:563" ph="{...}" />
+ <marker date="1525278018783" expanded="true" signature="687:931" ph="{...}" />
+ <marker date="1525278018783" expanded="true" signature="765:928" ph="{...}" />
+ <marker date="1525278018783" expanded="true" signature="799:860" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
</component>
<component name="Git.Settings">
<option name="ROOT_SYNC" value="DONT_SYNC" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
- <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/video.cs" root0="FORCE_HIGHLIGHTING" />
+ <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/InitialPosition.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/ApplyPostProcessingEffect.cs" root0="FORCE_HIGHLIGHTING" />
- <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followMe.cs" root0="FORCE_HIGHLIGHTING" />
- <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/Calibration.cs" root0="SKIP_HIGHLIGHTING" />
- <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/SamplerCalibrator.cs" root0="FORCE_HIGHLIGHTING" />
- <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs" root0="SKIP_HIGHLIGHTING" />
- <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/place.cs" root0="FORCE_HIGHLIGHTING" />
- <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/baseScript.cs" root0="FORCE_HIGHLIGHTING" />
+ <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.shader" root0="SKIP_HIGHLIGHTING" />
+ <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/linerender.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/ZoomText.cs" root0="FORCE_HIGHLIGHTING" />
+ <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/PlaceHolderTokenHandler.cs" root0="FORCE_HIGHLIGHTING" />
+ <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/video.cs" root0="FORCE_HIGHLIGHTING" />
+ <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followTheToken.cs" root0="FORCE_HIGHLIGHTING" />
+ <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/Calibration.cs" root0="FORCE_HIGHLIGHTING" />
+ <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/SamplerCalibrator.cs" root0="FORCE_HIGHLIGHTING" />
+ <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/createLink.cs" root0="FORCE_HIGHLIGHTING" />
+ <setting file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/imgTexture.cs" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
@@ -304,14 +282,19 @@
<option value="$PROJECT_DIR$/Assets/Calibration/Scripts/linerender.cs" />
<option value="$PROJECT_DIR$/Assets/Ressources/calib.txt" />
<option value="$PROJECT_DIR$/Assets/Calibration/Scripts/baseScript.cs" />
- <option value="$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs" />
<option value="$PROJECT_DIR$/Assets/Calibration/Scripts/Calibration.cs" />
+ <option value="$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs" />
+ <option value="$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.shader" />
<option value="$PROJECT_DIR$/Assets/Calibration/Scripts/SamplerCalibrator.cs" />
+ <option value="$PROJECT_DIR$/Assets/Calibration/Scripts/createLink.cs" />
+ <option value="$PROJECT_DIR$/Assets/Calibration/Scripts/InitialPosition.cs" />
+ <option value="$PROJECT_DIR$/Assets/Calibration/Scripts/PlaceHolderTokenHandler.cs" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
- <option name="y" value="23" />
+ <option name="x" value="213" />
+ <option name="y" value="12" />
<option name="width" value="1680" />
<option name="height" value="1027" />
</component>
@@ -320,11 +303,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="SolutionExplorer">
- <option name="show-file-system" value="false" />
- <option name="show-all-items" value="false" />
- </pane>
- <pane id="Scratches" />
<pane id="UnityExplorer">
<subPane>
<expand>
@@ -354,13 +332,18 @@
</subPane>
<option name="show-hidden-items" value="false" />
</pane>
+ <pane id="SolutionExplorer">
+ <option name="show-file-system" value="false" />
+ <option name="show-all-items" value="false" />
+ </pane>
+ <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="Rider.ProjectViewActivator.IsNotFirstRun" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/Assets/Calibration/Scripts" />
- <property name="settings.editor.selected.configurable" value="preferences.general" />
+ <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -416,14 +399,15 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+ <editor active="true" />
<layout>
<window_info anchor="bottom" id="TODO" order="6" />
- <window_info anchor="right" id="Errors In Solution" order="3" />
+ <window_info anchor="top" id="Errors In Solution" order="0" side_tool="true" weight="0.32924107" />
<window_info anchor="bottom" id="Event Log" order="12" side_tool="true" weight="0.3191721" />
<window_info anchor="bottom" id="Unit Tests" order="7" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.32897604" />
<window_info anchor="bottom" id="Run" order="2" />
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.114605546" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.11433087" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Unity" order="11" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -446,90 +430,14 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="update" />
- <option name="LAST_COMMIT_MESSAGE" value="update" />
+ <MESSAGE value="Add Lens distortion to the project" />
+ <option name="LAST_COMMIT_MESSAGE" value="Add Lens distortion to the project" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/place.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="16" selection-start-line="16" selection-end-line="16" />
- <folding>
- <marker date="1525278018782" expanded="false" signature="6:78" ph="..." />
- <marker date="1525278018782" expanded="true" signature="115:236" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="165:172" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="227:234" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/ZoomText.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="544">
- <caret line="34" column="1" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
- <folding>
- <marker date="1525278018777" expanded="false" signature="6:78" ph="..." />
- <marker date="1525278018777" expanded="true" signature="118:691" ph="{...}" />
- <marker date="1525278018777" expanded="true" signature="248:351" ph="{...}" />
- <marker date="1525278018777" expanded="true" signature="406:413" ph="{...}" />
- <marker date="1525278018777" expanded="true" signature="451:689" ph="{...}" />
- <marker date="1525278018777" expanded="true" signature="487:686" ph="{...}" />
- <marker date="1525278018777" expanded="true" signature="503:590" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followMe.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="459">
- <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
- <folding>
- <marker date="1527596492505" expanded="false" signature="6:78" ph="..." />
- <marker date="1527596492505" expanded="true" signature="118:875" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="215:230" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="285:300" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="339:873" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="380:686" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="429:623" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="640:651" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="732:870" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/video.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state>
- <folding>
- <marker date="1525278018783" expanded="false" signature="6:125" ph="..." />
- <marker date="1525278018783" expanded="true" signature="317:326" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="365:634" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="443:631" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="502:563" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="687:931" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="765:928" ph="{...}" />
- <marker date="1525278018783" expanded="true" signature="799:860" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/DataManager.cs" />
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/SamplerCalibrator.cs">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="425">
- <caret line="25" column="8" lean-forward="true" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="8" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/place.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
- <folding>
- <marker date="1525278018782" expanded="false" signature="6:78" ph="..." />
- <marker date="1525278018782" expanded="true" signature="115:236" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="165:172" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="227:234" ph="{...}" />
- </folding>
</state>
</provider>
</entry>
@@ -560,12 +468,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="16" selection-start-line="16" selection-end-line="16" />
- <folding>
- <marker date="1525278018782" expanded="false" signature="6:78" ph="..." />
- <marker date="1525278018782" expanded="true" signature="115:236" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="165:172" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="227:234" ph="{...}" />
- </folding>
</state>
</provider>
</entry>
@@ -603,7 +505,7 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/ProjectorCalibManager.cs" />
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followMe.cs">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followTheToken.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
@@ -719,12 +621,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" selection-start-line="16" selection-end-line="16" />
- <folding>
- <marker date="1525278018782" expanded="false" signature="6:78" ph="..." />
- <marker date="1525278018782" expanded="true" signature="115:236" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="165:172" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="227:234" ph="{...}" />
- </folding>
</state>
</provider>
</entry>
@@ -744,7 +640,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followMe.cs">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followTheToken.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
@@ -796,12 +692,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="16" selection-start-line="16" selection-end-line="16" />
- <folding>
- <marker date="1525278018782" expanded="false" signature="6:78" ph="..." />
- <marker date="1525278018782" expanded="true" signature="115:236" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="165:172" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="227:234" ph="{...}" />
- </folding>
</state>
</provider>
</entry>
@@ -821,7 +711,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followMe.cs">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followTheToken.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
@@ -867,12 +757,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
- <folding>
- <marker date="1525278018782" expanded="false" signature="6:78" ph="..." />
- <marker date="1525278018782" expanded="true" signature="115:236" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="165:172" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="227:234" ph="{...}" />
- </folding>
</state>
</provider>
</entry>
@@ -903,12 +787,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="16" selection-start-line="16" selection-end-line="16" />
- <folding>
- <marker date="1525278018782" expanded="false" signature="6:78" ph="..." />
- <marker date="1525278018782" expanded="true" signature="115:236" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="165:172" ph="{...}" />
- <marker date="1525278018782" expanded="true" signature="227:234" ph="{...}" />
- </folding>
</state>
</provider>
</entry>
@@ -956,27 +834,50 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/baseScript.cs" />
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followMe.cs">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/baseScript.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="238">
+ <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.shader">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="51">
- <caret line="5" column="6" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
+ <state relative-caret-position="808">
+ <caret line="79" column="1" selection-start-line="79" selection-start-column="1" selection-end-line="79" selection-end-column="1" />
<folding>
- <marker date="1527596492505" expanded="false" signature="6:78" ph="..." />
- <marker date="1527596492505" expanded="true" signature="118:875" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="215:230" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="285:300" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="339:873" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="380:686" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="429:623" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="640:651" ph="{...}" />
- <marker date="1527596492505" expanded="true" signature="732:870" ph="{...}" />
+ <marker date="1527784736472" expanded="true" signature="31:1615" ph="{...}" />
+ <marker date="1527784736472" expanded="true" signature="46:203" ph="{...}" />
+ <marker date="1527784736472" expanded="true" signature="216:1613" ph="{...}" />
+ <marker date="1527784736472" expanded="true" signature="288:1610" ph="{...}" />
+ <marker date="1527784736472" expanded="true" signature="302:1601" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="510">
+ <caret line="32" selection-start-line="32" selection-end-line="32" />
+ <folding>
+ <marker date="1527784511985" expanded="false" signature="6:78" ph="..." />
+ <marker date="1527784511985" expanded="true" signature="123:1144" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="247:309" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="334:375" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="401:563" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="643:702" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="723:790" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="811:878" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="899:966" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="987:1054" ph="{...}" />
+ <marker date="1527784511985" expanded="true" signature="1075:1142" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/Calibration.cs">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="505">
+ <state relative-caret-position="709">
<caret line="139" column="32" selection-start-line="139" selection-start-column="32" selection-end-line="139" selection-end-column="32" />
<folding>
<marker date="1527755616388" expanded="false" signature="6:178" ph="..." />
@@ -1050,61 +951,111 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/LensDistortion.cs">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/SamplerCalibrator.cs">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="16" column="24" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
+ <state relative-caret-position="391">
+ <caret line="105" column="29" selection-start-line="105" selection-start-column="8" selection-end-line="105" selection-end-column="29" />
<folding>
- <marker date="1527755616403" expanded="false" signature="6:78" ph="..." />
- <marker date="1527755616403" expanded="true" signature="123:1144" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="247:309" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="334:375" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="401:563" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="643:702" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="723:790" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="811:878" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="899:966" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="987:1054" ph="{...}" />
- <marker date="1527755616403" expanded="true" signature="1075:1142" ph="{...}" />
+ <marker date="1527785377471" expanded="false" signature="6:140" ph="..." />
+ <marker date="1527785377471" expanded="true" signature="188:5071" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="697:2194" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="862:2151" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="909:2011" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="1033:1123" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="2028:2141" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="2252:2599" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="2299:2497" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="2539:2593" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="2630:4581" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="3860:3924" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="4633:5069" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="4709:5040" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="4769:5030" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="4859:4926" ph="{...}" />
+ <marker date="1527785377471" expanded="true" signature="4947:5016" ph="{...}" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/SamplerCalibrator.cs">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/imgTexture.cs">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="35" selection-start-line="35" selection-end-line="35" />
+ <state>
<folding>
- <marker date="1527756477254" expanded="true" signature="6:140" ph="..." />
- <marker date="1527756477254" expanded="true" signature="188:4119" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="697:1812" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="873:1769" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="920:1629" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="1044:1134" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="1646:1759" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="1870:2217" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="1917:2115" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="2157:2211" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="2248:3629" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3201:3265" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3681:4117" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3757:4088" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3817:4078" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3907:3974" ph="{...}" />
- <marker date="1527756477254" expanded="true" signature="3995:4064" ph="{...}" />
+ <marker date="1525278018780" expanded="false" signature="6:78" ph="..." />
+ <marker date="1525278018780" expanded="true" signature="120:241" ph="{...}" />
+ <marker date="1525278018780" expanded="true" signature="170:177" ph="{...}" />
+ <marker date="1525278018780" expanded="true" signature="232:239" ph="{...}" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/baseScript.cs">
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/InitialPosition.cs">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+ <state relative-caret-position="442">
+ <caret line="26" selection-start-line="26" selection-end-line="26" />
+ <folding>
+ <marker date="1527869838651" expanded="true" signature="6:78" ph="..." />
+ <marker date="1527869838651" expanded="true" signature="125:592" ph="{...}" />
+ <marker date="1527869838651" expanded="true" signature="240:338" ph="{...}" />
+ <marker date="1527869838651" expanded="true" signature="393:400" ph="{...}" />
+ <marker date="1527869838651" expanded="true" signature="430:495" ph="{...}" />
+ <marker date="1527869838651" expanded="true" signature="525:590" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/followTheToken.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="476">
+ <caret line="30" column="43" selection-start-line="30" selection-start-column="43" selection-end-line="30" selection-end-column="43" />
+ <folding>
+ <marker date="1527596492505" expanded="false" signature="6:78" ph="..." />
+ <marker date="1527596492505" expanded="true" signature="118:875" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="215:230" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="285:300" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="339:873" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="380:686" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="429:623" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="640:651" ph="{...}" />
+ <marker date="1527596492505" expanded="true" signature="732:870" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Assets/calib">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="357">
+ <caret line="21" column="7" selection-start-line="21" selection-start-column="7" selection-end-line="21" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/PlaceHolderTokenHandler.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="272">
+ <caret line="18" column="20" lean-forward="true" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+ <folding>
+ <marker date="1527873639068" expanded="false" signature="6:78" ph="..." />
+ <marker date="1527873639068" expanded="true" signature="125:445" ph="{...}" />
+ <marker date="1527873639068" expanded="true" signature="215:381" ph="{...}" />
+ <marker date="1527873639068" expanded="true" signature="436:443" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Assets/Calibration/Scripts/createLink.cs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="306">
+ <caret line="24" column="15" lean-forward="true" selection-start-line="24" selection-start-column="15" selection-end-line="24" selection-end-column="15" />
<folding>
- <marker date="1527689140585" expanded="false" signature="6:78" ph="..." />
- <marker date="1527689140585" expanded="true" signature="120:241" ph="{...}" />
- <marker date="1527689140585" expanded="true" signature="170:177" ph="{...}" />
- <marker date="1527689140585" expanded="true" signature="232:239" ph="{...}" />
+ <marker date="1527856155417" expanded="false" signature="6:98" ph="..." />
+ <marker date="1527856155417" expanded="true" signature="140:906" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="279:312" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="332:345" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="385:707" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="426:704" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="477:561" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="587:663" ph="{...}" />
+ <marker date="1527856155417" expanded="true" signature="765:903" ph="{...}" />
</folding>
</state>
</provider>
diff --git a/Assets/Calibration/Scripts/LensDistortion.cs b/Assets/Calibration/Scripts/LensDistortion.cs
index c27460fa80efb4d73bb7511a0762d75c5da64742..2196a9d5931f05a08a2dd9e737217e03a9f274b3 100644
--- a/Assets/Calibration/Scripts/LensDistortion.cs
+++ b/Assets/Calibration/Scripts/LensDistortion.cs
@@ -6,7 +6,7 @@ public class LensDistortion : MonoBehaviour
{
public float t1, t2;
- public float k1, k2,k5;
+ public float k1, k2,k3;
public Shader s;
Material m;
@@ -24,7 +24,7 @@ private void Update()
m.SetFloat("k2", k2);
m.SetFloat("k3", t1);
m.SetFloat("k4", t2);
- m.SetFloat("k5", k5);
+ m.SetFloat("k5", k3);
}
private void OnRenderImage(RenderTexture source, RenderTexture destination)
{
@@ -55,9 +55,9 @@ public float K2
set { k2 = value; }
}
- public float K5
+ public float K3
{
- get { return k5; }
- set { k5 = value; }
+ get { return k3; }
+ set { k3 = value; }
}
}
diff --git a/Assets/Calibration/Scripts/SamplerCalibrator.cs b/Assets/Calibration/Scripts/SamplerCalibrator.cs
index d3be49868246b2f10b2362337593372e3750cf91..2439c89b231641105ca9bf8d8a0f35a5e85e0b8c 100644
--- a/Assets/Calibration/Scripts/SamplerCalibrator.cs
+++ b/Assets/Calibration/Scripts/SamplerCalibrator.cs
@@ -32,7 +32,7 @@ void Start()
{
_lensDistortionScript = Projector.GetComponent< LensDistortion >();
- _mPath = Application.dataPath + "/Ressources/"+ Filename;
+ _mPath = Application.dataPath +"/" + Filename;
if (Load)
{
@@ -48,10 +48,16 @@ void Start()
Pos = new Vector3(float.Parse(calibData[16]), float.Parse(calibData[17]), float.Parse(calibData[18]));
Rot = new Vector3(float.Parse(calibData[19]), float.Parse(calibData[20]), float.Parse(calibData[21]));
-
+
Projector.projectionMatrix = M;
Projector.transform.localPosition = Pos;
Projector.transform.localRotation = Quaternion.Euler(Rot);
+
+ _lensDistortionScript.T1 = float.Parse(calibData[22]);
+ _lensDistortionScript.T2 = float.Parse(calibData[23]);
+ _lensDistortionScript.K1 = float.Parse(calibData[24]);
+ _lensDistortionScript.K2 = float.Parse(calibData[25]);
+ _lensDistortionScript.K3 = float.Parse(calibData[26]);
Debug.Log("Projector calibration loaded");
}
@@ -97,14 +103,17 @@ void ComputeCalibration()
result.intrinsics.ProjectionMatrix(Projector.nearClipPlane, Projector.farClipPlane);
Debug.Log(result.intrinsics.ProjectionMatrix(Projector.nearClipPlane, Projector.farClipPlane).ToString());
-
+ _lensDistortionScript.T1 = result.distortion.P1;
+ _lensDistortionScript.T2 = result.distortion.P2;
+ _lensDistortionScript.K1 = result.distortion.K1;
+ _lensDistortionScript.K2 = result.distortion.K2;
+ _lensDistortionScript.K3 = result.distortion.K3;
+
M = Projector.projectionMatrix;
Pos = Projector.transform.localPosition;
Rot = Projector.transform.localRotation.eulerAngles;
-
-
- string[] calibData = new string[22];
+ string[] calibData = new string[27];
for (int i = 0; i < 16; i++)
{
@@ -117,7 +126,12 @@ void ComputeCalibration()
calibData[19] = Rot.x.ToString();
calibData[20] = Rot.y.ToString();
calibData[21] = Rot.z.ToString();
-
+ calibData[22] = result.distortion.K1.ToString();
+ calibData[23] = result.distortion.P2.ToString();
+ calibData[24] = result.distortion.K1.ToString();
+ calibData[25] = result.distortion.K2.ToString();
+ calibData[26] = result.distortion.K3.ToString();
+
File.WriteAllLines(_mPath, calibData);
print("La calibration a bien été enregistrée");
diff --git a/Assets/Calibration/Scripts/baseScript.cs b/Assets/Calibration/Scripts/baseScript.cs
deleted file mode 100644
index 64c7ccd4a33e27ed70d304c1f3012078b5a84638..0000000000000000000000000000000000000000
--- a/Assets/Calibration/Scripts/baseScript.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class baseScript : MonoBehaviour {
-
- // Use this for initialization
- void Start () {
-
- }
-
- // Update is called once per frame
- void Update () {
-
- }
-}
diff --git a/Assets/Calibration/Scripts/baseScript.cs.meta b/Assets/Calibration/Scripts/baseScript.cs.meta
deleted file mode 100644
index 12b2956f65b208b2f33612b35fb3c36bed6ebf21..0000000000000000000000000000000000000000
--- a/Assets/Calibration/Scripts/baseScript.cs.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-fileFormatVersion: 2
-guid: 6f9a45dc7aba815479e0fa5fbd3afd9a
-timeCreated: 1527686568
-licenseType: Free
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Calibration/Scripts/createLink.cs b/Assets/Calibration/Scripts/createLink.cs
index 349ead2eeee93b450ef35c8ebebd7ee4d8b70f28..e4ee920bde333f183ed2494e49ec8b1b80801e32 100755
--- a/Assets/Calibration/Scripts/createLink.cs
+++ b/Assets/Calibration/Scripts/createLink.cs
@@ -36,7 +36,7 @@ void OnTriggerEnter(Collider other) {
} else if (status == false){
status = true;
- DrawLine (this.gameObject, other.gameObject);
+ DrawLine (this.gameObject, other.gameObject);
}
if (cpt > 60)
@@ -45,7 +45,6 @@ void OnTriggerEnter(Collider other) {
}
-
public void DrawLine(GameObject start, GameObject end)
{
diff --git a/Assets/Calibration/Scripts/followMe.cs b/Assets/Calibration/Scripts/followTheToken.cs
similarity index 100%
rename from Assets/Calibration/Scripts/followMe.cs
rename to Assets/Calibration/Scripts/followTheToken.cs
diff --git a/Assets/Calibration/Scripts/followMe.cs.meta b/Assets/Calibration/Scripts/followTheToken.cs.meta
similarity index 100%
rename from Assets/Calibration/Scripts/followMe.cs.meta
rename to Assets/Calibration/Scripts/followTheToken.cs.meta
diff --git a/Assets/Calibration/Scripts/place.cs b/Assets/Calibration/Scripts/place.cs
deleted file mode 100755
index 416883a88d9148814a5a35feb7f080833c970e9d..0000000000000000000000000000000000000000
--- a/Assets/Calibration/Scripts/place.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class place : MonoBehaviour {
-
- // Use this for initialization
- void Start () {
-
- }
-
- // Update is called once per frame
- void Update () {
-
- }
-}
diff --git a/Assets/Calibration/Scripts/place.cs.meta b/Assets/Calibration/Scripts/place.cs.meta
deleted file mode 100755
index 71e2d4d663022ff4f7dbec63e78dd3cfc44965c1..0000000000000000000000000000000000000000
--- a/Assets/Calibration/Scripts/place.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 4bfd145edddbd4dc694e4ca7a98872f3
-timeCreated: 1488457443
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/calibrationScene.unity b/Assets/calibrationScene.unity
index 381c3c2f097daa4744ed9d08706dc36b4b5841b9..a96ec0072866bb0064ae4d6f824de6652d5c9162 100644
Binary files a/Assets/calibrationScene.unity and b/Assets/calibrationScene.unity differ
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index 3eeb3ee3f12a811a70ddffd23529779afd93232c..15a14ddedabac5e22f0e36fdd5fceddde178871f 100644
Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index f7bc8c08cfc5d97f9330c05b51ce7e2e3368fdca..1da5c9ebf9a393ab42e546670a96c2a815e0c655 100644
Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 3c3649262f23e2a8646c1348e3f0ea575380fe83..6bf59fcb6f74d9a0e03161952e3425d094bbe484 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.4.2f2
+m_EditorVersion: 2017.4.4f1