Epitech/T-DEV-811
4
0
Fork 0
Code Issues 7 Pull Requests 1 Packages Projects 1 Releases Wiki Activity

WIP: feat/AR_Architecture #43

Draft
Nicolas wants to merge 4 commits from feat/AR_Architecture into master
pull from: feat/AR_Architecture
merge into: Epitech:master
Conversation 0 Commits 4 Files Changed 698 +409 -20
18 changed files with 409 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d7b24a1c60 - Show all commits

2
AR/Assets/Editor/Vuforia/ImageTargetTextures/test/IMG20230424141425_scaled.jpg.meta generated
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f14b8106094c4838846be8322a92a51b
guid: 66f97ec6c2a743f6bb4b22dfafc30359
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

2
AR/Assets/Editor/Vuforia/ImageTargetTextures/test/Lhotse_Mountain_8-Bit_Grayscale_scaled.jpg.meta generated
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 27b7afa16a004a389b3e9b09676b2462
guid: f36891f74acb44b4aa552adf3e0b003d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

BIN
AR/Assets/Editor/Vuforia/ImageTargetTextures/test/conteneur-poubelle_scaled.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

183
AR/Assets/Editor/Vuforia/ImageTargetTextures/test/conteneur-poubelle_scaled.jpg.meta generated Normal file
View File

@ -0,0 +1,183 @@
fileFormatVersion: 2
guid: 2ed09fcfb74f4e7aa5163eadbe2ed3fa
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
cookieLightType: 2
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Lumin
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
AR/Assets/Editor/Vuforia/ImageTargetTextures/test/pngtree-cartoon-green_scaled.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

183
AR/Assets/Editor/Vuforia/ImageTargetTextures/test/pngtree-cartoon-green_scaled.jpg.meta generated Normal file
View File

@ -0,0 +1,183 @@
fileFormatVersion: 2
guid: 6c13d1dbee8b4cb8ad162f93eee5fbdb
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
cookieLightType: 2
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Lumin
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

2
AR/Assets/Editor/Vuforia/ImageTargetTextures/test/trash_1_scaled.jpg.meta generated
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f08a5d6e7bc24d9c925c8624d430dbdb
guid: d1388a7a890d4ef6b7efa8ef849d2103
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

2
AR/Assets/Editor/Vuforia/ImageTargetTextures/test/trash_2_scaled.jpg.meta generated
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a4bc2fbb8604410ea6f972557912572a
guid: e8760d4fa507461eae6e4dc7cb7d8c62
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

2
AR/Assets/MarkerTracker.cs
View File

@ -47,7 +47,6 @@ public class MarkerTracker : MonoBehaviour
{
if (arPrefab.name == trackedImage.referenceImage.name && !_instantiatedPrefabs.ContainsKey(ArPrefabs[0].name))
{
Debug.Log("New" + ArPrefabs[0].name);
var newPrefab = Instantiate(ArPrefabs[0], trackedImage.transform);
_instantiatedPrefabs.Add(ArPrefabs[0].name, newPrefab);
return;
@ -87,7 +86,6 @@ public class MarkerTracker : MonoBehaviour
{
if (existingPrefab.Key == trackedImage.referenceImage.name)
{
Debug.Log("Deleted : " + existingPrefab.Key);
_instantiatedPrefabs[trackedImage.referenceImage.name].SetActive(false);
}
}

4
AR/Assets/ReferenceImageLibrary.asset generated
View File

File diff suppressed because one or more lines are too long

26
AR/Assets/Scenes/Vuforia test.unity generated
View File

@ -702,6 +702,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 90
objectReference: {fileID: 0}
- target: {fileID: 7692855769418497485, guid: 677b677f966f56a4b8f6a9ee34fe24d5,
type: 3}
propertyPath: type
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 677b677f966f56a4b8f6a9ee34fe24d5, type: 3}
--- !u!224 &153989142 stripped
@ -1596,7 +1601,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &881112810
Transform:
m_ObjectHideFlags: 0
@ -2235,6 +2240,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 90
objectReference: {fileID: 0}
- target: {fileID: 7692855769418497485, guid: 677b677f966f56a4b8f6a9ee34fe24d5,
type: 3}
propertyPath: type
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 677b677f966f56a4b8f6a9ee34fe24d5, type: 3}
--- !u!224 &1186525488 stripped
@ -2374,7 +2384,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &1419773242
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2863,7 +2873,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1702789801
Transform:
m_ObjectHideFlags: 0
@ -3071,7 +3081,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1712626382
Transform:
m_ObjectHideFlags: 0
@ -3147,7 +3157,7 @@ MonoBehaviour:
PreviewVisible: 1
RuntimeOcclusion: 0
RuntimeCollider: 0
mTrackableName: trash_1
mTrackableName: pngtree-cartoon-green
mInitializedInEditor: 1
mDataSetPath: Vuforia/test.xml
mAspectRatio: 1
@ -3173,7 +3183,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
mObserverBehaviour: {fileID: 1712626385}
mHiddenRoot: {fileID: 0}
mTargetName: trash_1
mTargetName: pngtree-cartoon-green
mDatasetName: Vuforia/test.xml
mCastedBehaviour: {fileID: 1712626385}
mMeshFilter: {fileID: 0}
@ -4131,7 +4141,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &2016941986
Transform:
m_ObjectHideFlags: 0
@ -4337,7 +4347,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &2103254340
MonoBehaviour:
m_ObjectHideFlags: 0

BIN
AR/Assets/StreamingAssets/Vuforia/test.dat
View File

Binary file not shown.

2
AR/Assets/StreamingAssets/Vuforia/test.dat.meta generated
View File

@ -1,2 +1,2 @@
fileFormatVersion: 2
guid: d2dbd528a6e3467588680e741acff8aa
guid: 536cd9a9c1734826909e9295cf0b600f

2
AR/Assets/StreamingAssets/Vuforia/test.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<QCARConfig>
<Tracking>
<ImageTarget name="pngtree-cartoon-green" size="5.000000 5.000000" />
<ImageTarget name="conteneur-poubelle" size="5.000000 5.000000" />
<ImageTarget name="IMG20230424141425" size="10.000000 10.143796" />
<ImageTarget name="trash_2" size="5.000000 5.000000" />
<ImageTarget name="Lhotse_Mountain_8-Bit_Grayscale" size="5.000000 3.480000" />

2
AR/Assets/StreamingAssets/Vuforia/test.xml.meta generated
View File

@ -1,2 +1,2 @@
fileFormatVersion: 2
guid: 4bf082f2dbfc41e9bf63d94b5fc40645
guid: 56da2cf5f794476fb32df8bc272bd089

13
AR/Assets/TrashDataExtractor.cs
View File

@ -28,7 +28,7 @@ public class TrashDataExtractor : MonoBehaviour
void UpdateText()
{
String unit = "T/H";
String unit = "H/T";
if (this.type == TrashType.Distance)
{
unit = "D";
@ -36,6 +36,7 @@ public class TrashDataExtractor : MonoBehaviour
{
unit = "W";
}
if (PocketBaseDataProvider.trashes.Count <= 0 || PocketBaseDataProvider.trashes[0].data.Count <= 0)
{
return;
@ -58,9 +59,17 @@ public class TrashDataExtractor : MonoBehaviour
this.valueText.text = lastData.value + " " + lastData.unit;
if (this.type == TrashType.Temperature)
{
String[] v = lastData.value.Split(";");
String[] v = lastData.value.Split("/");
this.valueText.text = v[0] + " °C - " + v[1] + "% d'humidité";
}
if (this.type == TrashType.Distance)
{
this.valueText.text = lastData.value + " cm";
}
if (this.type == TrashType.Poids)
{
this.valueText.text = lastData.value + " gram";
}
}
void Update()

1
AR/Assets/models/Trash.cs
View File

@ -13,6 +13,7 @@ namespace models
public string owner;
public string updated;
public List<Data> data;
public string number;
}
[Serializable]

3
AR/Assets/services/TrashService.cs
View File

@ -21,7 +21,8 @@ namespace services
public static DataList ListTrashData(String token, String trashId)
{
return Api<DataList>.get("/api/collections/data/records/?trash_id="+trashId, token);
return Api<DataList>.get("/api/collections/data/records/?filter=(trash_id=\"" + trashId +"\")&sort=-created", token);
}
}
}