Skip to content

GitLab

  • Menu
    • Projects Groups Snippets
      Help
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • T Tugas-Akhir-SIMBA
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Galih Panji Hanindito
  • Tugas-Akhir-SIMBA
  • Merge requests
  • !6

Merged
Created 1 year ago by Galih Panji Hanindito@GalihPanji:grin:Maintainer7 of 7 tasks completed7/7 tasks

Update Vuforia AR marker design

  • Overview 1
  • Commits 6
  • Changes 95

Created by: SPENCER058

Description

This pull request updates the Vuforia AR image marker with a new design. The new marker design improves recognition and aligns with the updated branding guidelines.

Changes

  • Replaced the old Vuforia AR marker asset with the new design.

Motivation and Context

The new design aims to enhance the AR experience by improving marker recognition accuracy and reflecting the latest branding standards.

How Has This Been Tested?

  • Verified the new marker design works correctly in the AR environment.
  • Ensured the application recognizes the new marker without issues.

Related Issues

  • [Optional: Link to any related issues or discussions]

Screenshots (if applicable)

  • [Optional: Attach screenshots of the new design]

Checklist

  • My code follows the code style of this project.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have made corresponding changes to the documentation.
  • My changes generate no new warnings.
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes.
  • Galih Panji Hanindito
    Galih Panji Hanindito :grin: @GalihPanji · 1 year ago
    Author Maintainer

    Merged by: SPENCER058 at 2024-06-11 05:18:16 UTC

  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • master (base)

and
  • latest version
    7601bb46
    6 commits, 9 months ago

95 files
+ 12964
- 2394

    Preferences

    File browser
    Compare changes

Some changes are not shown

For a faster browsing experience, some files are collapsed by default.

Ass‎ets‎
3D/B‎anjir‎
Mate‎rials‎
Banjir KMM V‎ariant.prefab‎ +0 -79
Banjir ‎KMM.fbx‎ +0 -0
Banji‎r.fbx‎ +0 -0
Banjir.‎fbx.meta‎ +1 -1
Animations‎/Disasters‎
Flood‎ Anim‎
Flood_H‎igh.anim‎ +0 -53
Flood_High‎_Risk.anim‎ +3271 -0
Flood_High_R‎isk.anim.meta‎ +2 -2
Flood_L‎ow.anim‎ +0 -53
Flood_Low‎_Risk.anim‎ +3413 -0
Flood_Low_Ri‎sk.anim.meta‎ +2 -2
Flood_Me‎dium.anim‎ +0 -53
Flood_Mediu‎m_Risk.anim‎ +698 -0
Flood_Medium_‎Risk.anim.meta‎ +2 -2
FloodAnimationCon‎troller.controller‎ +3 -3
Ar‎ts‎
Ic‎ons‎
Icon 10‎80px.png‎ +0 -0
Icon 1080p‎x.png.meta‎ +0 -140
Icon 4‎8px.png‎ +0 -0
Icon 48px‎.png.meta‎ +0 -140
Icon 51‎2px.png‎ +0 -0
Icon 512p‎x.png.meta‎ +0 -140
Icon‎.png‎ +0 -0
Icon.p‎ng.meta‎ +1 -1
Image ‎Marker‎
24 Bi‎t PNG‎
Image Marker‎ - Flood.jpg‎ +0 -0
Image Marker -‎ Flood.jpg.meta‎ +0 -140
Image Marker -‎ Landslide.jpg‎ +0 -0
Image Marker - L‎andslide.jpg.meta‎ +0 -140
Image Marker ‎- Tsunami.jpg‎ +0 -0
Image Marker - ‎Tsunami.jpg.meta‎ +0 -140
marker_simba‎-ar_flood.png‎ +0 -0
marker_simba-ar‎_flood.png.meta‎ +8 -8
marker_simba-a‎r_landslide.png‎ +0 -0
marker_simba-ar_l‎andslide.png.meta‎ +8 -8
marker_simba-‎ar_tsunami.png‎ +0 -0
marker_simba-ar_‎tsunami.png.meta‎ +8 -8
Image Marker‎ - Flood.png‎ +0 -0
Image Marker -‎ Landslide.png‎ +0 -0
Image Marker ‎- Tsunami.png‎ +0 -0
Image Marker - ‎Tsunami.png.meta‎ +0 -140
Marker AR SIMB‎A - Banjir.png‎ +0 -0
Marker AR SIMBA ‎- Banjir.png.meta‎ +0 -140
Marker AR SIMBA -‎ Tanah Longsor.png‎ +0 -0
Marker AR SIMBA - Ta‎nah Longsor.png.meta‎ +0 -140
Marker AR SIMB‎A - Tsunami.png‎ +0 -0
Marker AR SIMBA -‎ Tsunami.png.meta‎ +0 -140
SIMBA AR New F‎lood Marker.png‎ +0 -0
SIMBA AR New Floo‎d Marker.png.meta‎ +1 -1
SIMBA AR New Lan‎dslide Marker.png‎ +0 -0
SIMBA AR New Landsl‎ide Marker.png.meta‎ +7 -7
SIMBA AR New Ts‎unami Marker.png‎ +0 -0
SIMBA AR New Tsuna‎mi Marker.png.meta‎ +7 -7
U‎Is‎
Simul‎ations‎
Idle‎.png‎ +0 -0
Idle.p‎ng.meta‎ +1 -1
About-T‎utor.png‎ +0 -0
About-Tuto‎r.png.meta‎ +1 -1
Marker - ‎About.png‎ +0 -0
Marker - Ab‎out.png.meta‎ +1 -1
Title_Mai‎n-Menu.png‎ +0 -0
Title_Main-M‎enu.png.meta‎ +1 -1
Title_Main-‎Menu_New.png‎ +0 -0
Editor/Vuforia/…/‎simba-ar_marker_db‎
flood_sc‎aled.jpg‎ +0 -0
flood_scal‎ed.jpg.meta‎ +1 -1
landslide_‎scaled.jpg‎ +0 -0
landslide_sc‎aled.jpg.meta‎ +1 -1
tsunami_s‎caled.jpg‎ +0 -0
tsunami_sca‎led.jpg.meta‎ +1 -1
Pre‎fabs‎
Disa‎sters‎
Disaster B‎ase.prefab‎ +25 -23
Flood Mod‎el.prefab‎ +189 -57
Landslide M‎odel.prefab‎ +4 -0
Tsunami Mo‎del.prefab‎ +4 -0
Mar‎ker‎
ImageTarget ‎Flood.prefab‎ +24 -24
ImageTarget La‎ndslide.prefab‎ +24 -24
ImageTarget T‎sunami.prefab‎ +24 -24
Particle‎s System‎
Flood_Rain‎_PS.prefab‎ +4835 -0
Flood_Rain_P‎S.prefab.meta‎ +1 -1
Sc‎ene‎
AR Scen‎e.prefab‎ +284 -514
U‎I‎
Pan‎els‎
Help Sub Menu ‎Variant.prefab‎ +2 -2
Main Menu P‎anel.prefab‎ +1 -1
Canvas AR Scan‎ Variant.prefab‎ +1 -1
Particles ‎System.meta‎ +8 -0
Reso‎urces‎
VuforiaConfig‎uration.asset‎ +1 -1
Sce‎nes‎
ARScan‎.unity‎ +11 -7
Scr‎ipts‎
Disa‎sters‎
Mana‎gers‎
DisasterM‎anager.cs‎ +2 -2
DisasterMan‎ager.cs.meta‎ +0 -0
DisasterUI‎Manager.cs‎ +0 -0
DisasterUIMa‎nager.cs.meta‎ +0 -0
BaseDisaster‎Controller.cs‎ +8 -8
FloodDisaster‎Controller.cs‎ +48 -0
FloodDisasterCo‎ntroller.cs.meta‎ +11 -0
Manage‎rs.meta‎ +8 -0
Miscel‎laneous‎
ARTrackerL‎istener.cs‎ +2 -2
StreamingAs‎sets/Vuforia‎
simba-ar_ma‎rker_db.dat‎ +0 -0
simba-ar_mark‎er_db.dat.meta‎ +1 -1
simba-ar_ma‎rker_db.xml‎ +2 -2
simba-ar_mark‎er_db.xml.meta‎ +1 -1
Project‎Settings‎
ProjectSet‎tings.asset‎ +4 -4
Assets/3D/Banjir/Materials/Banjir KMM Variant.prefab deleted 100644 → 0
+ 0
- 79
  • View file @ 808fd5bc

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &7459860430914813397
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -3809945072200597350, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: b19220d327ef16e44a7d21f21c78b4b7, type: 2}
- target: {fileID: -2195407104471221312, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: b0d9e2ab4fc8c954b9b1cb375fedbc92, type: 2}
- target: {fileID: -1660384031183063813, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: b0d9e2ab4fc8c954b9b1cb375fedbc92, type: 2}
- target: {fileID: 919132149155446097, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_Name
value: Banjir KMM Variant
objectReference: {fileID: 0}
- target: {fileID: 997999052853938494, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: b19220d327ef16e44a7d21f21c78b4b7, type: 2}
- target: {fileID: 8312148144452210890, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: b0d9e2ab4fc8c954b9b1cb375fedbc92, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8c2913210f9ef2149b632a64e2d2e969, type: 3}
Assets/3D/Banjir/Banjir KMM.fbx deleted 100644 → 0
+ 0
- 0
  • View file @ 808fd5bc

Banjir KMM.fbx

Download
Assets/3D/Banjir/Banjir.fbx 0 → 100644
+ 0
- 0
  • View file @ 7601bb46

Banjir.fbx

Download
Assets/3D/Banjir/Banjir KMM.fbx.meta → Assets/3D/Banjir/Banjir.fbx.meta
+ 1
- 1
  • View file @ 7601bb46

  • Edit in single-file editor

  • Edit in Web IDE


fileFormatVersion: 2
guid: 8c2913210f9ef2149b632a64e2d2e969
guid: 62910efa273ab64488d1223a6e1ba730
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
Show 20 lines Show all unchanged lines
Assets/Animations/Disasters/Flood Anim/Flood_High.anim deleted 100644 → 0
+ 0
- 53
  • View file @ 808fd5bc

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Flood_High
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
Assets/Animations/Disasters/Flood Anim/Flood_High_Risk.anim 0 → 100644
+ 3271
- 0
  • View file @ 7601bb46

  • Edit in single-file editor

  • Edit in Web IDE

Files with large changes are collapsed by default.

Assets/Animations/Disasters/Flood Anim/Flood_High.anim.meta → Assets/Animations/Disasters/Flood Anim/Flood_High_Risk.anim.meta
+ 2
- 2
  • View file @ 7601bb46

  • Edit in single-file editor

  • Edit in Web IDE

fileFormatVersion: 2
guid: e236cbe8f2afd144483ea69c96640364
guid: b54fd5dc40e32e4478fbb945a9ba9bbb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Animations/Disasters/Flood Anim/Flood_Low.anim deleted 100644 → 0
+ 0
- 53
  • View file @ 808fd5bc

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Flood_Low
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
Assets/Animations/Disasters/Flood Anim/Flood_Low_Risk.anim 0 → 100644
+ 3413
- 0
  • View file @ 7601bb46

  • Edit in single-file editor

  • Edit in Web IDE

Files with large changes are collapsed by default.

Assets/Animations/Disasters/Flood Anim/Flood_Low.anim.meta → Assets/Animations/Disasters/Flood Anim/Flood_Low_Risk.anim.meta
+ 2
- 2
  • View file @ 7601bb46

  • Edit in single-file editor

  • Edit in Web IDE

fileFormatVersion: 2
guid: f9611da8113c4874798e3bcfd7a3cd9d
guid: 2b01709dae65fdf448c3277e1e020867
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Animations/Disasters/Flood Anim/Flood_Medium.anim deleted 100644 → 0
+ 0
- 53
  • View file @ 808fd5bc

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Flood_Medium
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
Assets/Animations/Disasters/Flood Anim/Flood_Medium_Risk.anim 0 → 100644
+ 698
- 0
  • View file @ 7601bb46

  • Edit in single-file editor

  • Edit in Web IDE

Files with large changes are collapsed by default.

0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Milestone
No milestone
None
None
Time tracking
No estimate or time spent
0
Labels
None
Lock merge request
Unlocked
1
1 participant
Galih Panji Hanindito
Reference: GalihPanji/Tugas-Akhir-SIMBA!6
Source branch: develop

Menu

Projects Groups Snippets
Help