Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
test_vr
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
florian.hassler
test_vr
Commits
31a54e2b
Commit
31a54e2b
authored
6 years ago
by
florian.hassler
Browse files
Options
Downloads
Patches
Plain Diff
minor update
parent
0b83d6fd
Branches
master
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
test_vr_unity/Assets/Scenes/MainMultiplayer.unity
+23
-4
23 additions, 4 deletions
test_vr_unity/Assets/Scenes/MainMultiplayer.unity
test_vr_unity/Assets/Scripts/testTouch/ReferencePoint.cs
+0
-13
0 additions, 13 deletions
test_vr_unity/Assets/Scripts/testTouch/ReferencePoint.cs
with
23 additions
and
17 deletions
test_vr_unity/Assets/Scenes/MainMultiplayer.unity
+
23
−
4
View file @
31a54e2b
...
@@ -2241,7 +2241,7 @@ PrefabInstance:
...
@@ -2241,7 +2241,7 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
propertyPath
:
m_LocalPosition.y
value
:
0
value
:
1
0
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
propertyPath
:
m_LocalPosition.z
...
@@ -2249,7 +2249,7 @@ PrefabInstance:
...
@@ -2249,7 +2249,7 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
propertyPath
:
m_LocalRotation.x
value
:
0
value
:
0
.38268343
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
propertyPath
:
m_LocalRotation.y
...
@@ -2261,7 +2261,7 @@ PrefabInstance:
...
@@ -2261,7 +2261,7 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
propertyPath
:
m_LocalRotation.w
value
:
1
value
:
0.92387956
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
propertyPath
:
m_RootOrder
propertyPath
:
m_RootOrder
...
@@ -2269,7 +2269,7 @@ PrefabInstance:
...
@@ -2269,7 +2269,7 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
value
:
45
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
-
target
:
{
fileID
:
400004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
propertyPath
:
m_LocalEulerAnglesHint.y
...
@@ -2293,6 +2293,25 @@ Camera:
...
@@ -2293,6 +2293,25 @@ Camera:
type
:
3
}
type
:
3
}
m_PrefabInstance
:
{
fileID
:
2127732919
}
m_PrefabInstance
:
{
fileID
:
2127732919
}
m_PrefabAsset
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&2127732922
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
100004
,
guid
:
126d619cf4daa52469682f85c1378b4a
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
2127732919
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!114
&2127732923
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2127732922
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
6c77b574a57c2104c8a74ba9fc611dbb
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
player
:
{
fileID
:
0
}
---
!u!1001
&4382820208367757842
---
!u!1001
&4382820208367757842
PrefabInstance
:
PrefabInstance
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
...
This diff is collapsed.
Click to expand it.
test_vr_unity/Assets/Scripts/testTouch/ReferencePoint.cs
+
0
−
13
View file @
31a54e2b
...
@@ -8,23 +8,10 @@ public class ReferencePoint : MonoBehaviour
...
@@ -8,23 +8,10 @@ public class ReferencePoint : MonoBehaviour
bool
TouchedOnce
=
false
;
bool
TouchedOnce
=
false
;
private
void
OnTriggerEnter
(
Collider
other
)
private
void
OnTriggerEnter
(
Collider
other
)
{
{
// Debug.Log("TriggerEnter");
if
(!
TouchedOnce
&&
other
.
gameObject
.
tag
==
"gesture"
)
if
(!
TouchedOnce
&&
other
.
gameObject
.
tag
==
"gesture"
)
{
{
HandController
.
instance
.
IncrementCorrectPoint
();
HandController
.
instance
.
IncrementCorrectPoint
();
TouchedOnce
=
true
;
TouchedOnce
=
true
;
}
}
}
}
// Start is called before the first frame update
void
Start
()
{
}
// Update is called once per frame
void
Update
()
{
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment