Skip to content

Commit

Permalink
vrm-c#599 で部分的に取り込んだのでブランチを作り直し
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 0e13d39
Author: ousttrue <ousttrue@gmail.com>
Date:   Fri Nov 6 20:01:43 2020 +0900

    update JsonSchema

commit 82d82fc
Author: ousttrue <ousttrue@gmail.com>
Date:   Thu Nov 5 16:22:58 2020 +0900

    VRM10Expression, VRM10ExpressionAvatar

commit 04b2b57
Author: ousttrue <ousttrue@gmail.com>
Date:   Thu Nov 5 15:22:03 2020 +0900

    controller

commit 58ede8f
Author: ousttrue <ousttrue@gmail.com>
Date:   Thu Nov 5 14:40:26 2020 +0900

    VRM10FirstPerson

commit cd41daf
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Nov 4 22:56:19 2020 +0900

    LookAt

commit 88c8cae
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Nov 4 22:01:21 2020 +0900

    VRM10ControllerEditor tab

commit 98a3fcc
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Nov 4 17:34:06 2020 +0900

    ignore vrm-0.x

commit 8fa7dfd
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Nov 4 17:07:25 2020 +0900

    Expression

commit f736921
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Nov 4 16:43:52 2020 +0900

    Expression

commit 35f7571
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Nov 4 15:55:21 2020 +0900

    Expression

commit 1a36e21
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Nov 4 15:51:48 2020 +0900

    Expression

commit 339fea9
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Nov 4 15:37:53 2020 +0900

    Expression

commit 06b1dba
Author: ousttrue <ousttrue@gmail.com>
Date:   Mon Nov 2 20:05:20 2020 +0900

    Authors

commit efd86ba
Author: ousttrue <ousttrue@gmail.com>
Date:   Mon Nov 2 17:06:05 2020 +0900

    Merge AssetContainer to VRM10Controller

commit 10a3e1a
Author: ousttrue <ousttrue@gmail.com>
Date:   Mon Nov 2 17:00:45 2020 +0900

    Merge VRM10FirstPerson to VRM10Controller

commit e3abea9
Author: ousttrue <ousttrue@gmail.com>
Date:   Mon Nov 2 16:49:01 2020 +0900

    BoneMeshEraser

commit 351a2ed
Author: ousttrue <ousttrue@gmail.com>
Date:   Mon Nov 2 16:41:40 2020 +0900

    VRM10MetaObjectEditor

commit faf2fac
Author: ousttrue <ousttrue@gmail.com>
Date:   Mon Nov 2 16:24:50 2020 +0900

    merge VRM10Meta to VRM10Controller

commit c1e0b97
Author: ousttrue <ousttrue@gmail.com>
Date:   Mon Nov 2 15:33:58 2020 +0900

    fix warnings

commit 30a4393
Author: ousttrue <ousttrue@gmail.com>
Date:   Mon Nov 2 15:25:20 2020 +0900

    fix menu

commit 6e5effa
Author: ousttrue <ousttrue@gmail.com>
Date:   Fri Oct 30 22:15:27 2020 +0900

    fix Export and Import

commit 7f5a8ae
Author: ousttrue <ousttrue@gmail.com>
Date:   Fri Oct 30 19:16:26 2020 +0900

    VRM10Meta

commit 7ebd75d
Author: ousttrue <ousttrue@gmail.com>
Date:   Fri Oct 30 18:26:43 2020 +0900

    VRM10ExportDialog

commit 1233c5b
Author: ousttrue <ousttrue@gmail.com>
Date:   Fri Oct 30 17:52:45 2020 +0900

    MaterialValidator

commit e88596a
Author: ousttrue <ousttrue@gmail.com>
Date:   Fri Oct 30 17:18:13 2020 +0900

    NameValidator

commit fab3720
Author: ousttrue <ousttrue@gmail.com>
Date:   Fri Oct 30 16:05:33 2020 +0900

    DuplicateNodeNameExists

commit ec23c72
Author: ousttrue <ousttrue@gmail.com>
Date:   Fri Oct 30 15:56:47 2020 +0900

    VRMExporterHumanoidValidator

commit d643e1d
Author: ousttrue <ousttrue@gmail.com>
Date:   Fri Oct 30 15:16:33 2020 +0900

    VRMExporterHumanoidValidator

commit 78d3e8b
Author: ousttrue <ousttrue@gmail.com>
Date:   Fri Oct 30 14:57:16 2020 +0900

    MeshUtility.ExportValidator

commit e41e82d
Author: ousttrue <ousttrue@gmail.com>
Date:   Fri Oct 30 14:18:38 2020 +0900

    folder

commit e9f641f
Author: ousttrue <ousttrue@gmail.com>
Date:   Thu Oct 29 19:01:49 2020 +0900

    ScrollArea

commit 2070bc0
Author: ousttrue <ousttrue@gmail.com>
Date:   Thu Oct 29 16:27:21 2020 +0900

    update Validator interface

commit 2250622
Author: ousttrue <ousttrue@gmail.com>
Date:   Thu Oct 29 15:46:18 2020 +0900

    VRMExporterWizard

commit 517f613
Author: ousttrue <ousttrue@gmail.com>
Date:   Thu Oct 29 14:48:01 2020 +0900

    Msg

commit 4f045b4
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Oct 28 20:15:46 2020 +0900

    ErrorLevels

commit 5674174
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Oct 28 20:05:10 2020 +0900

    MeshUtility.Validation

commit 4763fb5
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Oct 28 17:58:49 2020 +0900

    VRM10ExportDialog

commit ef10d39
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Oct 28 17:58:12 2020 +0900

    MeshUtility.M17N

commit 282f38f
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Oct 28 17:09:46 2020 +0900

    TabBar

commit 3ab1994
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Oct 28 16:33:40 2020 +0900

    ExportDialogState

commit f50769d
Author: ousttrue <ousttrue@gmail.com>
Date:   Wed Oct 28 15:48:57 2020 +0900

    コード整理

commit 4707507
Author: ousttrue <ousttrue@gmail.com>
Date:   Tue Oct 27 20:28:44 2020 +0900

    copy VRM10 from UniVRM-1.0

commit 2b9ced0
Author: ousttrue <ousttrue@gmail.com>
Date:   Tue Oct 27 19:38:20 2020 +0900

    copy vrmlib from UniVRM-1.0

commit d34ba8f
Author: ousttrue <ousttrue@gmail.com>
Date:   Tue Oct 27 19:33:30 2020 +0900

    copy dotnet.system.memory
  • Loading branch information
ousttrue committed Jan 5, 2021
1 parent 54645cf commit bd6e0d4
Show file tree
Hide file tree
Showing 681 changed files with 91,729 additions and 0 deletions.
1 change: 1 addition & 0 deletions Assets/MeshUtility/Editor/MeshUtility.Editor.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "MeshUtility.Editor",
"references": [
"MeshUtility",
"VrmLib",
"ShaderProperty.Runtime"
],
"optionalUnityReferences": [],
Expand Down
8 changes: 8 additions & 0 deletions Assets/MeshUtility/dotnet.system.memory.meta

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

Empty file.
7 changes: 7 additions & 0 deletions Assets/MeshUtility/dotnet.system.memory/CHANGELOG.md.meta

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

8 changes: 8 additions & 0 deletions Assets/MeshUtility/dotnet.system.memory/Documentation.meta

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

Empty file.

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

21 changes: 21 additions & 0 deletions Assets/MeshUtility/dotnet.system.memory/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 ousttrue

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
7 changes: 7 additions & 0 deletions Assets/MeshUtility/dotnet.system.memory/LICENSE.md.meta

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

9 changes: 9 additions & 0 deletions Assets/MeshUtility/dotnet.system.memory/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# dotnet.system.memory

from https://www.nuget.org/packages/System.Memory/

`System.Span` for `.NET Standard 2.0`

## upm registration

https://upm-packages.dev/-/web/detail/dotnet.system.memory
7 changes: 7 additions & 0 deletions Assets/MeshUtility/dotnet.system.memory/README.md.meta

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

8 changes: 8 additions & 0 deletions Assets/MeshUtility/dotnet.system.memory/Runtime.meta

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

50 changes: 50 additions & 0 deletions Assets/MeshUtility/dotnet.system.memory/Runtime/Extensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
using System.Collections;
using System.Collections.Generic;
using System.IO;

namespace System
{
/// <summary>
/// .NETCore-3.1 とのギャップを埋める
/// </summary>
public static class Extensions
{
public static void Deconstruct<T, U>(this KeyValuePair<T, U> pair, out T key, out U value)
{
key = pair.Key;
value = pair.Value;
}

public static void Write(this Stream s, byte[] bytes)
{
s.Write(bytes, 0, bytes.Length);
}

public static bool TryAdd<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key, TValue addValue)
{
bool canAdd = !dict.ContainsKey(key);

if (canAdd)
dict.Add(key, addValue);

return canAdd;
}

public static TValue GetValueOrDefault<TKey, TValue>(this System.Collections.Generic.IReadOnlyDictionary<TKey, TValue> dictionary, TKey key)
{
if (dictionary.TryGetValue(key, out TValue value))
{
return value;
}
else
{
return default;
}
}

public static ArraySegment<T> Slice<T>(this ArraySegment<T> src, int offset, int count)
{
return new ArraySegment<T>(src.Array, src.Offset + offset, count);
}
}
}
11 changes: 11 additions & 0 deletions Assets/MeshUtility/dotnet.system.memory/Runtime/Extensions.cs.meta

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "dotnet.system.memory",
"references": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": true,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": true
}

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

8 changes: 8 additions & 0 deletions Assets/MeshUtility/vrmlib.meta

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

3 changes: 3 additions & 0 deletions Assets/MeshUtility/vrmlib/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# VrmLib

A 3D model utility for VRM.
7 changes: 7 additions & 0 deletions Assets/MeshUtility/vrmlib/README.md.meta

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

8 changes: 8 additions & 0 deletions Assets/MeshUtility/vrmlib/Runtime.meta

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

Loading

0 comments on commit bd6e0d4

Please sign in to comment.