diff --git a/Assets/Common/Images/SpellingBasics/goedeavond.png b/Assets/Common/Images/SpellingBasics/goedeavond.png new file mode 100644 index 0000000..d90298c Binary files /dev/null and b/Assets/Common/Images/SpellingBasics/goedeavond.png differ diff --git a/Assets/Common/Images/SpellingBasics/goedeavond.png.meta b/Assets/Common/Images/SpellingBasics/goedeavond.png.meta new file mode 100644 index 0000000..ef4ae8e --- /dev/null +++ b/Assets/Common/Images/SpellingBasics/goedeavond.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 1df76d321ac1c984e8809e92a5ae6d5f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + 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: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Common/Images/SpellingBasics/goedemiddag.png b/Assets/Common/Images/SpellingBasics/goedemiddag.png new file mode 100644 index 0000000..a5e19e2 Binary files /dev/null and b/Assets/Common/Images/SpellingBasics/goedemiddag.png differ diff --git a/Assets/Common/Images/SpellingBasics/goedemiddag.png.meta b/Assets/Common/Images/SpellingBasics/goedemiddag.png.meta new file mode 100644 index 0000000..5fe120a --- /dev/null +++ b/Assets/Common/Images/SpellingBasics/goedemiddag.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: bf52126d7537c894ca4b576c5eef699b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + 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: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Common/Images/SpellingBasics/goedemorgen.png b/Assets/Common/Images/SpellingBasics/goedemorgen.png new file mode 100644 index 0000000..2f1200a Binary files /dev/null and b/Assets/Common/Images/SpellingBasics/goedemorgen.png differ diff --git a/Assets/Common/Images/SpellingBasics/goedemorgen.png.meta b/Assets/Common/Images/SpellingBasics/goedemorgen.png.meta new file mode 100644 index 0000000..8c6206f --- /dev/null +++ b/Assets/Common/Images/SpellingBasics/goedemorgen.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 3d2e3ec9ed08795429f60c10f335196b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + 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: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Common/Images/SpellingBasics/goedenacht.png b/Assets/Common/Images/SpellingBasics/goedenacht.png new file mode 100644 index 0000000..067fff0 Binary files /dev/null and b/Assets/Common/Images/SpellingBasics/goedenacht.png differ diff --git a/Assets/Common/Images/SpellingBasics/goedenacht.png.meta b/Assets/Common/Images/SpellingBasics/goedenacht.png.meta new file mode 100644 index 0000000..686b149 --- /dev/null +++ b/Assets/Common/Images/SpellingBasics/goedenacht.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 77bad74134ac6cd439cc026dafffa3aa +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + 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: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Common/Images/SpellingBasics/hallo.png b/Assets/Common/Images/SpellingBasics/hallo.png index e379a0b..73a84b7 100644 Binary files a/Assets/Common/Images/SpellingBasics/hallo.png and b/Assets/Common/Images/SpellingBasics/hallo.png differ diff --git a/Assets/Common/Images/SpellingBasics/hallo.png.meta b/Assets/Common/Images/SpellingBasics/hallo.png.meta index 5453e35..87033ed 100644 --- a/Assets/Common/Images/SpellingBasics/hallo.png.meta +++ b/Assets/Common/Images/SpellingBasics/hallo.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f2a020e24bfa24842bccecf6b36d5b79 +guid: 9736ebf7e194d954e8db0c651e72210e TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -102,7 +102,7 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: WebGL + buildTarget: Windows Store Apps maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 diff --git a/Assets/Common/Images/SpellingBasics/slecht.png b/Assets/Common/Images/SpellingBasics/slecht.png new file mode 100644 index 0000000..83e359f Binary files /dev/null and b/Assets/Common/Images/SpellingBasics/slecht.png differ diff --git a/Assets/Common/Images/SpellingBasics/slecht.png.meta b/Assets/Common/Images/SpellingBasics/slecht.png.meta new file mode 100644 index 0000000..7ac02be --- /dev/null +++ b/Assets/Common/Images/SpellingBasics/slecht.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 42286591a195a7542a4f0922fbe161e2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + 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: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Common/Images/SpellingBasics/smakelijk.png b/Assets/Common/Images/SpellingBasics/smakelijk.png new file mode 100644 index 0000000..45781a0 Binary files /dev/null and b/Assets/Common/Images/SpellingBasics/smakelijk.png differ diff --git a/Assets/Common/Images/SpellingBasics/smakelijk.png.meta b/Assets/Common/Images/SpellingBasics/smakelijk.png.meta new file mode 100644 index 0000000..db08da8 --- /dev/null +++ b/Assets/Common/Images/SpellingBasics/smakelijk.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 650f938e5cacbc2409939ab73077b692 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + 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: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Common/Images/SpellingBasics/sorry.png b/Assets/Common/Images/SpellingBasics/sorry.png new file mode 100644 index 0000000..905f396 Binary files /dev/null and b/Assets/Common/Images/SpellingBasics/sorry.png differ diff --git a/Assets/Common/Images/SpellingBasics/sorry.png.meta b/Assets/Common/Images/SpellingBasics/sorry.png.meta new file mode 100644 index 0000000..05e3559 --- /dev/null +++ b/Assets/Common/Images/SpellingBasics/sorry.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 4d265c68fdb4f644ba22e74523ba7f1b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + 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: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Common/Images/SpellingBasics/tot ziens.png b/Assets/Common/Images/SpellingBasics/tot ziens.png new file mode 100644 index 0000000..e379a0b Binary files /dev/null and b/Assets/Common/Images/SpellingBasics/tot ziens.png differ diff --git a/Assets/Common/Images/SpellingBasics/tot ziens.png.meta b/Assets/Common/Images/SpellingBasics/tot ziens.png.meta new file mode 100644 index 0000000..5453e35 --- /dev/null +++ b/Assets/Common/Images/SpellingBasics/tot ziens.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: f2a020e24bfa24842bccecf6b36d5b79 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + 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: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Common/Interfaces/Course.cs b/Assets/Common/Interfaces/Course.cs index 0f32dca..583ca95 100644 --- a/Assets/Common/Interfaces/Course.cs +++ b/Assets/Common/Interfaces/Course.cs @@ -20,6 +20,7 @@ public class Course : ScriptableObject /// /// A short description of the course /// + [TextArea] public string description; /// diff --git a/Assets/Common/Interfaces/Minigame.cs b/Assets/Common/Interfaces/Minigame.cs index db50df6..8e6e72e 100644 --- a/Assets/Common/Interfaces/Minigame.cs +++ b/Assets/Common/Interfaces/Minigame.cs @@ -19,6 +19,7 @@ public class Minigame : ScriptableObject /// /// A short description of the minigame /// + [TextArea] public string description; /// diff --git a/Assets/Common/Interfaces/ModelIndex.cs b/Assets/Common/Interfaces/ModelIndex.cs index 7727855..f188477 100644 --- a/Assets/Common/Interfaces/ModelIndex.cs +++ b/Assets/Common/Interfaces/ModelIndex.cs @@ -1,6 +1,3 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; /// /// This enum is used to identify each of the SignLanguage models /// @@ -8,5 +5,5 @@ public enum ModelIndex { NONE, FINGERSPELLING, - BASICSIGNS + BASIC_SIGNS } diff --git a/Assets/Common/Interfaces/Theme.cs b/Assets/Common/Interfaces/Theme.cs index 74783f8..3ca9a2d 100644 --- a/Assets/Common/Interfaces/Theme.cs +++ b/Assets/Common/Interfaces/Theme.cs @@ -15,6 +15,7 @@ public class Theme : ScriptableObject /// /// A short description of the theme /// + [TextArea] public string description; /// diff --git a/Assets/Common/ScriptableObjects/BasicSignsTheme.asset b/Assets/Common/ScriptableObjects/BasicSignsTheme.asset new file mode 100644 index 0000000..a919c0b --- /dev/null +++ b/Assets/Common/ScriptableObjects/BasicSignsTheme.asset @@ -0,0 +1,94 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6b0fdaea76420c48b69a990fabb107f, type: 3} + m_Name: BasicSignsTheme + m_EditorClassIdentifier: + title: Basis Gebaren + description: Van links tot rechts + themeIndex: 1 + modelIndex: 2 + learnables: + - name: Tot ziens + image: {fileID: 21300000, guid: f2a020e24bfa24842bccecf6b36d5b79, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Saluut + image: {fileID: 21300000, guid: 9736ebf7e194d954e8db0c651e72210e, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Goedemorgen + image: {fileID: 21300000, guid: 3d2e3ec9ed08795429f60c10f335196b, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Goedemiddag + image: {fileID: 21300000, guid: bf52126d7537c894ca4b576c5eef699b, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Goed + image: {fileID: 21300000, guid: df027cf65fb04bd408d4062aa9ec0b0f, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Slecht + image: {fileID: 21300000, guid: 42286591a195a7542a4f0922fbe161e2, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Ja + image: {fileID: 21300000, guid: 0b11c08cf900cd041afab0419594dac2, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Links + image: {fileID: 21300000, guid: 1dbac4bae035dc84f8bb19045a290b3c, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Rechts + image: {fileID: 21300000, guid: 712e26ec9b082ad4bb926c4171815e47, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Dank u + image: {fileID: 21300000, guid: ae9e448e11485c54aa664b69833dce2f, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Sorry + image: {fileID: 21300000, guid: 4d265c68fdb4f644ba22e74523ba7f1b, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Goedenacht + image: {fileID: 21300000, guid: 77bad74134ac6cd439cc026dafffa3aa, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Smakelijk + image: {fileID: 21300000, guid: 650f938e5cacbc2409939ab73077b692, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Goedeavond + image: {fileID: 21300000, guid: 1df76d321ac1c984e8809e92a5ae6d5f, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} + - name: Nee + image: {fileID: 21300000, guid: 9107fcdcf02ace74bae5b8dd77835434, type: 3} + handGuide: {fileID: 0} + thresholdPercentage: 0.9 + clip: {fileID: 0} diff --git a/Assets/Common/ScriptableObjects/BasicSignsTheme.asset.meta b/Assets/Common/ScriptableObjects/BasicSignsTheme.asset.meta new file mode 100644 index 0000000..0ede7a4 --- /dev/null +++ b/Assets/Common/ScriptableObjects/BasicSignsTheme.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd48f91f5d3b2d041b08640872a65d9c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Common/ScriptableObjects/SignThemeList.asset b/Assets/Common/ScriptableObjects/SignThemeList.asset index 9bb9916..36a9250 100644 --- a/Assets/Common/ScriptableObjects/SignThemeList.asset +++ b/Assets/Common/ScriptableObjects/SignThemeList.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: currentThemeIndex: 0 themes: + - {fileID: 11400000, guid: dd48f91f5d3b2d041b08640872a65d9c, type: 2} - {fileID: 11400000, guid: 6abf76ea9ca532a44b852393ad2d219f, type: 2} - {fileID: 11400000, guid: 5755ca304d16d3449991668b383d7dd5, type: 2} - {fileID: 11400000, guid: 12f3260b96f41d1478804406d793a927, type: 2} diff --git a/Assets/Courses/ScriptableObjects/BasicsCourse.asset b/Assets/Courses/ScriptableObjects/BasicsCourse.asset new file mode 100644 index 0000000..ba94df0 --- /dev/null +++ b/Assets/Courses/ScriptableObjects/BasicsCourse.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6b23e64e6ffb12459ed4f37d7305852, type: 3} + m_Name: BasicsCourse + m_EditorClassIdentifier: + index: 1 + title: Basis Gebaren + description: In deze les leer je een aantal basisgebaren, die je kan gebruiken + in het dagelijkse leven. + thumbnail: {fileID: 21300000, guid: f2a020e24bfa24842bccecf6b36d5b79, type: 3} + theme: {fileID: 11400000, guid: dd48f91f5d3b2d041b08640872a65d9c, type: 2} diff --git a/Assets/Courses/ScriptableObjects/BasicsCourse.asset.meta b/Assets/Courses/ScriptableObjects/BasicsCourse.asset.meta new file mode 100644 index 0000000..fcf837a --- /dev/null +++ b/Assets/Courses/ScriptableObjects/BasicsCourse.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e2fbe5ef8bbfaf41ae2af179c1ab52e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Courses/ScriptableObjects/CourseList.asset b/Assets/Courses/ScriptableObjects/CourseList.asset index 9d59799..ad7c245 100644 --- a/Assets/Courses/ScriptableObjects/CourseList.asset +++ b/Assets/Courses/ScriptableObjects/CourseList.asset @@ -15,6 +15,7 @@ MonoBehaviour: currentCourseIndex: 2 courses: - {fileID: 11400000, guid: 300921292bfd5564b8ce70b834c3f334, type: 2} + - {fileID: 11400000, guid: 1e2fbe5ef8bbfaf41ae2af179c1ab52e, type: 2} - {fileID: 11400000, guid: 622bbd43e3debd044b790f1f3f325f35, type: 2} - {fileID: 11400000, guid: a4c862fb404312b499c146eb0e957820, type: 2} - {fileID: 11400000, guid: fd1ef360b467b0943aca7c2b11ed1314, type: 2} diff --git a/Assets/Courses/Scripts/CoursesController.cs b/Assets/Courses/Scripts/CoursesController.cs index 2679082..d204e50 100644 --- a/Assets/Courses/Scripts/CoursesController.cs +++ b/Assets/Courses/Scripts/CoursesController.cs @@ -396,18 +396,19 @@ public class CoursesController : AbstractFeedback { // Get current sign Learnable sign = course.theme.learnables[currentWordIndex]; - string currentSign = sign.name; + string currentSign = sign.name.ToUpper().Replace(" ", "-"); // Get the predicted sign if (signPredictor != null && signPredictor.learnableProbabilities != null && currentSign != null && signPredictor.learnableProbabilities.ContainsKey(currentSign)) { + Debug.Log($"{signPredictor.learnableProbabilities.Aggregate("", (t, e) => $"{t}{e.Key}={e.Value}, ")}"); float accCurrentSign = signPredictor.learnableProbabilities[currentSign]; // Get highest predicted sign string predictedSign = signPredictor.learnableProbabilities.Aggregate((a, b) => a.Value > b.Value ? a : b).Key; float accPredictSign = signPredictor.learnableProbabilities[predictedSign]; - Learnable predSign = course.theme.learnables.Find(l => l.name == predictedSign); + Learnable predSign = course.theme.learnables.Find(l => l.name.ToUpper().Replace(" ", "-") == predictedSign); if (feedbackText != null && feedbackProgressImage != null) { @@ -424,7 +425,7 @@ public class CoursesController : AbstractFeedback } else if (accPredictSign > predSign.thresholdPercentage) { - feedbackText.text = $"Verkeerde gebaar: '{predictedSign}'"; + feedbackText.text = $"Verkeerde gebaar: '{predSign.name}'"; col = new Color(0xf5 / 255.0f, 0x49 / 255.0f, 0x3d / 255.0f); accCurrentSign = 0.0f; } diff --git a/Assets/MediaPipeUnity/Scripts/SignPredictor.cs b/Assets/MediaPipeUnity/Scripts/SignPredictor.cs index 88db727..f272c93 100644 --- a/Assets/MediaPipeUnity/Scripts/SignPredictor.cs +++ b/Assets/MediaPipeUnity/Scripts/SignPredictor.cs @@ -6,11 +6,11 @@ using NatML.Internal; using System.Collections; using System.Collections.Generic; using System.Diagnostics; +using System.IO; using System.Linq; using System.Threading.Tasks; using UnityEngine; using UnityEngine.UI; -using System.IO; [System.Serializable] @@ -395,7 +395,7 @@ public class SignPredictor : MonoBehaviour { string jsonData = File.ReadAllText(filePath); - UnityEngine.Debug.Log(jsonData); + //UnityEngine.Debug.Log(jsonData); embeddingDataList = JsonUtility.FromJson("{\"dataList\":" + jsonData + "}"); } @@ -600,38 +600,43 @@ public class SignPredictor : MonoBehaviour { List distances = GetDistances(result, 2); - learnableProbabilities = new Dictionary(); + var probs = new Dictionary(); for (int j = 0; j < distances.Count; j++) { DistanceEmbedding distanceEmbedding = distances[j]; // check if already in dictionary - if (learnableProbabilities.ContainsKey(distanceEmbedding.embeddingData.label_name)) + if (probs.ContainsKey(distanceEmbedding.embeddingData.label_name)) { // if so, check if the distance is smaller - if (learnableProbabilities[distanceEmbedding.embeddingData.label_name] > distanceEmbedding.distance) + if (probs[distanceEmbedding.embeddingData.label_name] > distanceEmbedding.distance) { // if so, replace the distance - learnableProbabilities[distanceEmbedding.embeddingData.label_name] = distanceEmbedding.distance; + probs[distanceEmbedding.embeddingData.label_name] = distanceEmbedding.distance; } } else { // if not, add the distance to the dictionary - learnableProbabilities.Add(distanceEmbedding.embeddingData.label_name, distanceEmbedding.distance); + probs.Add(distanceEmbedding.embeddingData.label_name, distanceEmbedding.distance); } } - Dictionary newLearnableProbabilities = new Dictionary(); - // convert distances to probabilities, the closer to 1.5 the better the prediction - foreach (KeyValuePair entry in learnableProbabilities) + var newProbs = new Dictionary(); + float sum = 0.0f; + foreach (KeyValuePair entry in probs) { - float probability = 1 / (1 + Mathf.Pow(2.71828f, (entry.Value - 1.6f) * 2)); - newLearnableProbabilities.Add(entry.Key, probability); + float probability = 1 / (1 + Mathf.Exp(2 * (entry.Value - 1.6f))); + newProbs.Add(entry.Key, probability); + sum += probability; } - learnableProbabilities = newLearnableProbabilities; + learnableProbabilities = new Dictionary(); + foreach (var kv in newProbs) + learnableProbabilities.Add(kv.Key, kv.Value / sum); + + //UnityEngine.Debug.Log($"{learnableProbabilities.Aggregate("", (t, e) => $"{t}{e.Key}={e.Value}, ")}"); foreach (Listener listener in listeners) { diff --git a/Assets/SystemArchitecture/Scripts/CourseIndex.cs b/Assets/SystemArchitecture/Scripts/CourseIndex.cs index e0d37de..328f6dd 100644 --- a/Assets/SystemArchitecture/Scripts/CourseIndex.cs +++ b/Assets/SystemArchitecture/Scripts/CourseIndex.cs @@ -5,7 +5,7 @@ public enum CourseIndex { FINGERSPELLING, - BASICSIGNS, + BASIC_SIGNS, CLOTHING, ANIMALS, FOOD, diff --git a/Assets/SystemArchitecture/Scripts/ThemeIndex.cs b/Assets/SystemArchitecture/Scripts/ThemeIndex.cs index da93c90..4be508b 100644 --- a/Assets/SystemArchitecture/Scripts/ThemeIndex.cs +++ b/Assets/SystemArchitecture/Scripts/ThemeIndex.cs @@ -5,6 +5,7 @@ public enum ThemeIndex { SIGN_ALPHABET, + SIGN_BASICS, SIGN_CLOTHING, SIGN_ANIMALS, SIGN_FOOD,