diff --git a/Artits work/Cathode Ray/Models/CR_All_H.fbx b/Artits work/Cathode Ray/Models/CR_All_H.fbx new file mode 100644 index 0000000..3650606 Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_All_H.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_All_L.fbx b/Artits work/Cathode Ray/Models/CR_All_L.fbx new file mode 100644 index 0000000..ad19423 Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_All_L.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_All_M.fbx b/Artits work/Cathode Ray/Models/CR_All_M.fbx new file mode 100644 index 0000000..f0c888a Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_All_M.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_Without-Ampule.fbx b/Artits work/Cathode Ray/Models/CR_Without-Ampule.fbx new file mode 100644 index 0000000..9f7651a Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_Without-Ampule.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_Without-Arrow_H.fbx b/Artits work/Cathode Ray/Models/CR_Without-Arrow_H.fbx new file mode 100644 index 0000000..738371d Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_Without-Arrow_H.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_Without-Arrow_L.fbx b/Artits work/Cathode Ray/Models/CR_Without-Arrow_L.fbx new file mode 100644 index 0000000..67cb211 Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_Without-Arrow_L.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_Without-Arrow_M.fbx b/Artits work/Cathode Ray/Models/CR_Without-Arrow_M.fbx new file mode 100644 index 0000000..e016510 Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_Without-Arrow_M.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_Without-Yellow-and-Arrow_H.fbx b/Artits work/Cathode Ray/Models/CR_Without-Yellow-and-Arrow_H.fbx new file mode 100644 index 0000000..d631a7e Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_Without-Yellow-and-Arrow_H.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_Without-Yellow-and-Arrow_L.fbx b/Artits work/Cathode Ray/Models/CR_Without-Yellow-and-Arrow_L.fbx new file mode 100644 index 0000000..88016e4 Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_Without-Yellow-and-Arrow_L.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_Without-Yellow-and-Arrow_M.fbx b/Artits work/Cathode Ray/Models/CR_Without-Yellow-and-Arrow_M.fbx new file mode 100644 index 0000000..c778ece Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_Without-Yellow-and-Arrow_M.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_Without-Yellow_H.fbx b/Artits work/Cathode Ray/Models/CR_Without-Yellow_H.fbx new file mode 100644 index 0000000..5b283b6 Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_Without-Yellow_H.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_Without-Yellow_L.fbx b/Artits work/Cathode Ray/Models/CR_Without-Yellow_L.fbx new file mode 100644 index 0000000..72c6b74 Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_Without-Yellow_L.fbx differ diff --git a/Artits work/Cathode Ray/Models/CR_Without-Yellow_M.fbx b/Artits work/Cathode Ray/Models/CR_Without-Yellow_M.fbx new file mode 100644 index 0000000..bac37ce Binary files /dev/null and b/Artits work/Cathode Ray/Models/CR_Without-Yellow_M.fbx differ diff --git a/Artits work/Cathode Ray/Textures/extra.png b/Artits work/Cathode Ray/Textures/extra.png new file mode 100644 index 0000000..baec1f8 Binary files /dev/null and b/Artits work/Cathode Ray/Textures/extra.png differ diff --git a/Artits work/Cathode Ray/Textures/madeira_textura.png b/Artits work/Cathode Ray/Textures/madeira_textura.png new file mode 100644 index 0000000..7aa4167 Binary files /dev/null and b/Artits work/Cathode Ray/Textures/madeira_textura.png differ diff --git a/Artits work/Cathode Ray/Textures/madeira_textura.png.meta b/Artits work/Cathode Ray/Textures/madeira_textura.png.meta new file mode 100644 index 0000000..a5ff13a --- /dev/null +++ b/Artits work/Cathode Ray/Textures/madeira_textura.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 6359f5855533d0d4b8503c864c63b9b6 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7d9252b546dd6c344a49eecb5429ec6c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Artits work/Cathode Ray/Textures/metal_normals.png b/Artits work/Cathode Ray/Textures/metal_normals.png new file mode 100644 index 0000000..0b9e765 Binary files /dev/null and b/Artits work/Cathode Ray/Textures/metal_normals.png differ diff --git a/Artits work/Cathode Ray/Textures/metal_normalsfix.png.meta b/Artits work/Cathode Ray/Textures/metal_normalsfix.png.meta new file mode 100644 index 0000000..8c73eb6 --- /dev/null +++ b/Artits work/Cathode Ray/Textures/metal_normalsfix.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: a5e12a8304d55584d915dff5d54b383a +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1a1092c58e4e94647aafea7efdd1ab63 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Artits work/Cathode Ray/Textures/metal_textures.png b/Artits work/Cathode Ray/Textures/metal_textures.png new file mode 100644 index 0000000..2e2e902 Binary files /dev/null and b/Artits work/Cathode Ray/Textures/metal_textures.png differ diff --git a/Artits work/Cathode Ray/Textures/metal_textures.png.meta b/Artits work/Cathode Ray/Textures/metal_textures.png.meta new file mode 100644 index 0000000..6718331 --- /dev/null +++ b/Artits work/Cathode Ray/Textures/metal_textures.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: b913ea10390504b4192683da43c6885f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 32b878ab135b6114ebbad87e124cd13e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Artits work/Cathode Ray/Textures/plastico_borracha_text.png b/Artits work/Cathode Ray/Textures/plastico_borracha_text.png new file mode 100644 index 0000000..c481a8c Binary files /dev/null and b/Artits work/Cathode Ray/Textures/plastico_borracha_text.png differ diff --git a/Artits work/Cathode Ray/Textures/plastico_borracha_text.png.meta b/Artits work/Cathode Ray/Textures/plastico_borracha_text.png.meta new file mode 100644 index 0000000..c7fd103 --- /dev/null +++ b/Artits work/Cathode Ray/Textures/plastico_borracha_text.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 8ff24713ad7a32c44995e8273ec0e5d6 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 9f7b8b90d56090546a4b577410d8e5a1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/README.md b/README.md index b07ff01..5121ccc 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ It allows to rotate the object and manipulate his values. Automatically saves th 
 
 IST-Thesis-Faraday-Museum
+├─ Artiste Work
+│	└─ Contains the work done by Marta Mendes, in the 3D modulation of the Cathode Ray
 ├─ Project
 │	└─ Contains the work developed in the context of this thesis
 └─ State of the Art