Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
ButtonPusher
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Button Pusher
ButtonPusher
Commits
7473ef61
Commit
7473ef61
authored
7 years ago
by
16이상민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Repair: bodyindex always 0 cause first letter of buffer name is big letter
parent
c1882494
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
87 additions
and
9 deletions
+87
-9
TransparentScreenShader.mat
Assets/Resources/GreenScreen/TransparentScreenShader.mat
+76
-0
TransparentScreenShader.mat.meta
...ts/Resources/GreenScreen/TransparentScreenShader.mat.meta
+3
-2
TransparentScreenShader.shader
Assets/Resources/GreenScreen/TransparentScreenShader.shader
+1
-1
TransparentScreenShader.shader.meta
...Resources/GreenScreen/TransparentScreenShader.shader.meta
+3
-2
InGame.unity
Assets/Scene/InGame.unity
+2
-2
tmp.unity
Assets/Scene/tmp.unity
+1
-1
CoordinateMapperView.cs
Assets/Script/CoordinateMapperView.cs
+1
-1
No files found.
Assets/Resources/GreenScreen/
GreenScreen
.mat
→
Assets/Resources/GreenScreen/
TransparentScreenShader
.mat
View file @
7473ef61
...
...
@@ -6,8 +6,8 @@ Material:
m_ObjectHideFlags
:
0
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
GreenScreen
m_Shader
:
{
fileID
:
4800000
,
guid
:
b5175284b0ff7764bae573155e1a773f
,
type
:
3
}
m_Name
:
TransparentScreenShader
m_Shader
:
{
fileID
:
4800000
,
guid
:
2daa4f94cea4bef4fab73f4a5a972b9e
,
type
:
3
}
m_ShaderKeywords
:
m_LightmapFlags
:
4
m_EnableInstancingVariants
:
0
...
...
@@ -18,11 +18,23 @@ Material:
m_SavedProperties
:
serializedVersion
:
3
m_TexEnvs
:
-
_B
ackgroundTex
:
-
_B
umpMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_BaseTex
:
-
_DetailAlbedoMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_DetailMask
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_DetailNormalMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_EmissionMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
...
...
@@ -30,11 +42,35 @@ Material:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_Mask
:
-
_MetallicGlossMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_OcclusionMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_ParallaxMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
m_Floats
:
-
_Cutoff
:
0
-
_BumpScale
:
1
-
_Cutoff
:
0.5
-
_DetailNormalMapScale
:
1
-
_DstBlend
:
0
-
_GlossMapScale
:
1
-
_Glossiness
:
0.5
-
_GlossyReflections
:
1
-
_Metallic
:
0
-
_Mode
:
0
-
_OcclusionStrength
:
1
-
_Parallax
:
0.02
-
_SmoothnessTextureChannel
:
0
-
_SpecularHighlights
:
1
-
_SrcBlend
:
1
-
_UVSec
:
0
-
_ZWrite
:
1
m_Colors
:
-
_Color
:
{
r
:
0
,
g
:
1
,
b
:
0
,
a
:
0
}
-
_Color
:
{
r
:
0.7607844
,
g
:
0.7607844
,
b
:
0.7607844
,
a
:
0
}
-
_EmissionColor
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
1
}
This diff is collapsed.
Click to expand it.
Assets/Resources/GreenScreen/
GreenScreen
.mat.meta
→
Assets/Resources/GreenScreen/
TransparentScreenShader
.mat.meta
View file @
7473ef61
fileFormatVersion: 2
guid:
6805a505ebdaf35449ded07154e29f1c
timeCreated: 15
03487250
guid:
a1fba0e040daade4c8e74fa059e8faa2
timeCreated: 15
18170142
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
...
...
This diff is collapsed.
Click to expand it.
Assets/Resources/GreenScreen/
Green
ScreenShader.shader
→
Assets/Resources/GreenScreen/
Transparent
ScreenShader.shader
View file @
7473ef61
// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
Shader
"DX11/
Green
ScreenShader"
{
Shader
"DX11/
Transparnet
ScreenShader"
{
Properties
{
_Color
(
"Main Color"
,
Color
)
=
(
1
,
1
,
1
,
1
)
}
...
...
This diff is collapsed.
Click to expand it.
Assets/Resources/GreenScreen/
Green
ScreenShader.shader.meta
→
Assets/Resources/GreenScreen/
Transparent
ScreenShader.shader.meta
View file @
7473ef61
fileFormatVersion: 2
guid:
b5175284b0ff7764bae573155e1a773f
timeCreated: 15
03487250
guid:
2daa4f94cea4bef4fab73f4a5a972b9e
timeCreated: 15
18170058
licenseType: Free
ShaderImporter:
externalObjects: {}
defaultTextures: []
userData:
assetBundleName:
...
...
This diff is collapsed.
Click to expand it.
Assets/Scene/InGame.unity
View file @
7473ef61
...
...
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity
:
1
m_CustomReflection
:
{
fileID
:
0
}
m_Sun
:
{
fileID
:
0
}
m_IndirectSpecularColor
:
{
r
:
0.373119
92
,
g
:
0.38074034
,
b
:
0.35872713
,
a
:
1
}
m_IndirectSpecularColor
:
{
r
:
0.373119
53
,
g
:
0.38074014
,
b
:
0.3587274
,
a
:
1
}
---
!u!157
&3
LightmapSettings
:
m_ObjectHideFlags
:
0
...
...
@@ -3591,7 +3591,7 @@ MeshRenderer:
m_LightProbeUsage
:
0
m_ReflectionProbeUsage
:
1
m_Materials
:
-
{
fileID
:
2100000
,
guid
:
6805a505ebdaf35449ded07154e29f1c
,
type
:
2
}
-
{
fileID
:
2100000
,
guid
:
a1fba0e040daade4c8e74fa059e8faa2
,
type
:
2
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
...
...
This diff is collapsed.
Click to expand it.
Assets/Scene/tmp.unity
View file @
7473ef61
...
...
@@ -392,7 +392,7 @@ MeshRenderer:
m_LightProbeUsage
:
0
m_ReflectionProbeUsage
:
1
m_Materials
:
-
{
fileID
:
2100000
,
guid
:
6805a505ebdaf35449ded07154e29f1c
,
type
:
2
}
-
{
fileID
:
2100000
,
guid
:
a1fba0e040daade4c8e74fa059e8faa2
,
type
:
2
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
...
...
This diff is collapsed.
Click to expand it.
Assets/Script/CoordinateMapperView.cs
View file @
7473ef61
...
...
@@ -22,7 +22,7 @@ public class CoordinateMapperView : MonoBehaviour
DepthBuffer
=
GenerateBuffer
(
"depthCoordinates"
,
sizeof
(
float
)
*
2
,
manager
.
DepthCoordinates
,
material
);
BodyIndexBuffer
=
GenerateBuffer
(
"
B
odyIndexBuffer"
,
sizeof
(
float
),
BodyIndexBuffer
=
GenerateBuffer
(
"
b
odyIndexBuffer"
,
sizeof
(
float
),
manager
.
BodyIndexBuffer
,
material
);
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment