Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
/[Ll]ogs/
/[Mm]emoryCaptures/
/[Uu]serSettings
/[Ii]mages/
/[Ii]mages
/[Mm]askedImages

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta
Expand Down
3 changes: 2 additions & 1 deletion RobotTesting/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
/[Ll]ogs/
/[Mm]emoryCaptures/
/[Uu]serSettings
/[Ii]mages/
/[Ii]mages
/[Mm]askedImages

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Material
m_Name: RedMarker
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
m_InvalidKeywords: []
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions RobotTesting/Assets/Models.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions RobotTesting/Assets/Resources.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions RobotTesting/Assets/Resources/Shader.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions RobotTesting/Assets/Resources/Shader/WhiteReplacementShader.shader
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
Shader "Unlit/WhiteReplacementShader" {
Properties {
_MainTex ("Texture", 2D) = "white" {}
}

SubShader {
Tags { "RenderType"="Opaque" }

Pass {
CGPROGRAM
#pragma vertex vert
#pragma fragment frag

#pragma shader_feature WORLD_NORMAL_VIS
#include "UnityCG.cginc"

struct appdata{
float4 vertex : POSITION;
};

struct v2f {
float4 vertex : SV_POSITION;
};

v2f vert (appdata v) {
v2f o;
o.vertex = UnityObjectToClipPos(v.vertex);
return o;
}

fixed4 frag () : SV_Target {
return fixed4(1,1,1,1); //White colour of marker
}
ENDCG
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading