Epitech/T-VIR-901_EpiLeARn
4
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/multi_targets

Browse Source 
# Conflicts:
#	Assets/Resources/VuforiaConfiguration.asset
#	Assets/__Scenes/CompositionMode.unity
#	Packages/com.ptc.vuforia.engine-10.18.4.tgz
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
#	ProjectSettings/TagManager.asset
This commit is contained in:
Nicolas
2024-01-12 11:03:32 +01:00
parent a7912733e5 73394e562d
commit aff9df22cf
227 changed files with 7539 additions and 6020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/StreamingAssets/Vuforia/VuforiaMars_Images.dat
View File

Binary file not shown.

9
Assets/StreamingAssets/Vuforia/VuforiaMars_Images.dat.meta
View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: e8ea1fa6394e8d94893c329a44c9a340
timeCreated: 1502300612
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

24
Assets/StreamingAssets/Vuforia/VuforiaMars_Images.xml
View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<QCARConfig>
<Tracking>
<CylinderTarget name="RocketBooster" sideLength="0.114980"/>
<ImageTarget name="Astronaut" size="0.069850 0.120650"/>
<ImageTarget name="Drone" size="0.069850 0.120650"/>
<ImageTarget name="Fissure" size="0.069850 0.120650"/>
<ImageTarget name="Oxygen" size="0.069850 0.120650"/>
<ImageTarget name="MarsBox.Top" size="0.076200 0.038100"/>
<ImageTarget name="MarsBox.Bottom" size="0.076200 0.038100"/>
<ImageTarget name="MarsBox.Back" size="0.076200 0.101600"/>
<ImageTarget name="MarsBox.Front" size="0.076200 0.101600"/>
<ImageTarget name="MarsBox.Right" size="0.038100 0.101600"/>
<ImageTarget name="MarsBox.Left" size="0.038100 0.101600"/>
<MultiTarget name="MarsBox">
<Part name="MarsBox.Left" translation="-0.038100000470876694 0 0" rotation="AD: 0 1 0 -90"/>
<Part name="MarsBox.Right" translation="0.038100000470876694 0 0" rotation="AD: 0 1 0 90"/>
<Part name="MarsBox.Front" translation="0 0 0.019050000235438347" rotation="AD: 1 0 0 0"/>
<Part name="MarsBox.Back" translation="0 0 -0.019050000235438347" rotation="AD: 0 1 0 180"/>
<Part name="MarsBox.Top" translation="0 0.05079999938607216 0" rotation="AD: 1 0 0 -90"/>
<Part name="MarsBox.Bottom" translation="0 -0.05079999938607216 0" rotation="AD: 1 0 0 90"/>
</MultiTarget>
</Tracking>
</QCARConfig>

2
Assets/StreamingAssets/Vuforia/VuforiaMars_Images.xml.meta
View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 7a7da849527748169c9d1a3dbbff2af1