Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
P
Physics Simulator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ease-ph
DeepLanguageUnderstanding
simulation
Physics Simulator
Commits
ae5291f3
Verified
Commit
ae5291f3
authored
Jul 03, 2020
by
Sebastian Höffner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Making the new dae-feature of schemasim work to use the same objects as the physics simulation.
parent
afe85c77
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
2167 additions
and
61 deletions
+2167
-61
.gitmodules
.gitmodules
+0
-6
Assets/DLU/Resources/cookiedough.mat
Assets/DLU/Resources/cookiedough.mat
+77
-0
Assets/DLU/Resources/cookiedough.mat.meta
Assets/DLU/Resources/cookiedough.mat.meta
+8
-0
Assets/DLU/Resources/white.mat
Assets/DLU/Resources/white.mat
+77
-0
Assets/DLU/Resources/white.mat.meta
Assets/DLU/Resources/white.mat.meta
+8
-0
Assets/DLU/Scenes/Kitchen.unity
Assets/DLU/Scenes/Kitchen.unity
+1946
-53
Assets/DLU/Scripts/Editor/SemanticBehaviourEditor.cs
Assets/DLU/Scripts/Editor/SemanticBehaviourEditor.cs
+27
-0
Assets/DLU/Scripts/Editor/SemanticBehaviourEditor.cs.meta
Assets/DLU/Scripts/Editor/SemanticBehaviourEditor.cs.meta
+11
-0
Assets/DLU/Scripts/SemanticBehaviour.cs
Assets/DLU/Scripts/SemanticBehaviour.cs
+10
-1
Assets/DLU/Scripts/SemanticBehaviours/DesignedContainer.cs
Assets/DLU/Scripts/SemanticBehaviours/DesignedContainer.cs
+2
-1
Assets/DLU/Scripts/SemanticBehaviours/Entity.cs
Assets/DLU/Scripts/SemanticBehaviours/Entity.cs
+1
-0
No files found.
.gitmodules
View file @
ae5291f3
[submodule "SimpleJSON"]
path = SimpleJSON
url = https://github.com/Bunny83/SimpleJSON
[submodule "Assets/SimpleJSON"]
path = Assets/SimpleJSON
url = https://github.com/Bunny83/SimpleJSON
[submodule "Assets/RuntimeColladaImporter"]
path = Assets/RuntimeColladaImporter
url = https://github.com/takashiw/RuntimeColladaImporter
Assets/DLU/Resources/cookiedough.mat
0 → 100644
View file @
ae5291f3
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!21
&2100000
Material
:
serializedVersion
:
6
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
cookiedough
m_Shader
:
{
fileID
:
46
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_ShaderKeywords
:
m_LightmapFlags
:
4
m_EnableInstancingVariants
:
0
m_DoubleSidedGI
:
0
m_CustomRenderQueue
:
-1
stringTagMap
:
{}
disabledShaderPasses
:
[]
m_SavedProperties
:
serializedVersion
:
3
m_TexEnvs
:
-
_BumpMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_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
}
-
_MainTex
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_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
:
-
_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
:
1
,
g
:
0.78432494
,
b
:
0.28773582
,
a
:
1
}
-
_EmissionColor
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
1
}
Assets/DLU/Resources/cookiedough.mat.meta
0 → 100644
View file @
ae5291f3
fileFormatVersion: 2
guid: a176093a05e0d48649993761c1887ba0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/DLU/Resources/white.mat
0 → 100644
View file @
ae5291f3
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!21
&2100000
Material
:
serializedVersion
:
6
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
white
m_Shader
:
{
fileID
:
46
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_ShaderKeywords
:
_EMISSION
m_LightmapFlags
:
2
m_EnableInstancingVariants
:
0
m_DoubleSidedGI
:
0
m_CustomRenderQueue
:
-1
stringTagMap
:
{}
disabledShaderPasses
:
[]
m_SavedProperties
:
serializedVersion
:
3
m_TexEnvs
:
-
_BumpMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_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
}
-
_MainTex
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_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
:
-
_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
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
-
_EmissionColor
:
{
r
:
0.5
,
g
:
0.5
,
b
:
0.5
,
a
:
1
}
Assets/DLU/Resources/white.mat.meta
0 → 100644
View file @
ae5291f3
fileFormatVersion: 2
guid: e452339b779ac47b5aff033b735a27b5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/DLU/Scenes/Kitchen.unity
View file @
ae5291f3
This diff is collapsed.
Click to expand it.
Assets/DLU/Scripts/Editor/SemanticBehaviourEditor.cs
0 → 100644
View file @
ae5291f3
using
UnityEditor
;
using
UnityEngine
;
namespace
dlu
{
[
CustomEditor
(
typeof
(
SemanticBehaviour
),
true
)]
public
class
SemanticBehaviourEditor
:
Editor
{
public
override
void
OnInspectorGUI
()
{
SemanticBehaviour
sb
=
(
SemanticBehaviour
)
target
;
ConfigureAssetPath
(
sb
);
DrawDefaultInspector
();
}
private
void
ConfigureAssetPath
(
SemanticBehaviour
sb
)
{
sb
.
asset
=
EditorGUILayout
.
ObjectField
(
"Asset"
,
sb
.
asset
,
typeof
(
GameObject
),
false
)
as
GameObject
;
if
(
sb
.
asset
!=
null
)
{
sb
.
assetPath
=
AssetDatabase
.
GetAssetPath
(
sb
.
asset
).
Substring
(
"Assets/"
.
Length
);
}
}
}
}
\ No newline at end of file
Assets/DLU/Scripts/Editor/SemanticBehaviourEditor.cs.meta
0 → 100644
View file @
ae5291f3
fileFormatVersion: 2
guid: 234e7cecbcd7a45d191c077c51d7cb9f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/DLU/Scripts/SemanticBehaviour.cs
View file @
ae5291f3
...
...
@@ -9,7 +9,16 @@ public abstract class SemanticBehaviour : MonoBehaviour
{
public
string
is_a
;
public
abstract
void
WriteTo
(
JSONObject
jsonObject
);
[
HideInInspector
]
public
GameObject
asset
;
public
string
assetPath
;
public
virtual
void
WriteTo
(
JSONObject
jsonObject
)
{
if
(
assetPath
!=
""
)
{
jsonObject
[
"asset"
]
=
$"
{
Application
.
dataPath
}
/
{
assetPath
}
"
;
}
}
}
}
\ No newline at end of file
Assets/DLU/Scripts/SemanticBehaviours/DesignedContainer.cs
View file @
ae5291f3
...
...
@@ -5,7 +5,7 @@ using SimpleJSON;
namespace
dlu
{
public
class
DesignedContainer
:
SemanticBehaviour
public
class
DesignedContainer
:
Entity
{
public
List
<
Collider
>
containmentParts
;
...
...
@@ -16,6 +16,7 @@ public class DesignedContainer : SemanticBehaviour
public
override
void
WriteTo
(
JSONObject
jsonObject
)
{
base
.
WriteTo
(
jsonObject
);
JSONArray
containment
=
new
JSONArray
();
foreach
(
Collider
collider
in
containmentParts
)
{
...
...
Assets/DLU/Scripts/SemanticBehaviours/Entity.cs
View file @
ae5291f3
...
...
@@ -18,6 +18,7 @@ public class Entity : SemanticBehaviour
public
override
void
WriteTo
(
JSONObject
jsonObject
)
{
base
.
WriteTo
(
jsonObject
);
JSONObject
transform
=
new
JSONObject
();
transform
[
"position"
]
=
this
.
transform
.
position
;
transform
[
"orientation"
]
=
this
.
transform
.
rotation
;
...
...
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