diff --git a/InteractiveControl/Content/UI/Page6_sub.uasset b/InteractiveControl/Content/UI/Page6_sub.uasset index f2eb9bd..95461c8 100644 --- a/InteractiveControl/Content/UI/Page6_sub.uasset +++ b/InteractiveControl/Content/UI/Page6_sub.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71d18b79f43964d789b647d30b4912152f3e001d66f04bfbb8ad310e11371c2a -size 329481 +oid sha256:f1d99e774697157d2d14f1a6a804c14cbed9ecfd98f917e827e3a800ac0534b4 +size 331507 diff --git a/SpaceStudioClient/Content/3D_Assets/Materials/M_mosaic_闪烁_Inst.uasset b/SpaceStudioClient/Content/3D_Assets/Materials/M_mosaic_闪烁_Inst.uasset index 1b19407..0a938c5 100644 --- a/SpaceStudioClient/Content/3D_Assets/Materials/M_mosaic_闪烁_Inst.uasset +++ b/SpaceStudioClient/Content/3D_Assets/Materials/M_mosaic_闪烁_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de80f493c3d81a9215b72a759d65e4a5631822d801bdcce65d8c7273dba1cafc -size 13598 +oid sha256:3f7d8616ae87b4eb74f85c16e09f7604197f44433474f3fa451a81c48b5a2833 +size 9162 diff --git a/SpaceStudioClient/Content/3D_Assets/Materials/M_mosaic_闪烁_Inst1.uasset b/SpaceStudioClient/Content/3D_Assets/Materials/M_mosaic_闪烁_Inst1.uasset new file mode 100644 index 0000000..cb86780 --- /dev/null +++ b/SpaceStudioClient/Content/3D_Assets/Materials/M_mosaic_闪烁_Inst1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f81be58e499bbf7bf742fd983d1322bc50ac2e9e0ec965b390c2c9390516752 +size 14018 diff --git a/SpaceStudioClient/Content/Blueprints/KinectRange.uasset b/SpaceStudioClient/Content/Blueprints/KinectRange.uasset new file mode 100644 index 0000000..bd3eb24 --- /dev/null +++ b/SpaceStudioClient/Content/Blueprints/KinectRange.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bc51f7e5109d3b3b7c9d92b9c515e7525617093ddcd419098d2dd9622809116 +size 8342 diff --git a/SpaceStudioClient/Content/Blueprints/NDPawn.uasset b/SpaceStudioClient/Content/Blueprints/NDPawn.uasset index afa1f26..36a6deb 100644 --- a/SpaceStudioClient/Content/Blueprints/NDPawn.uasset +++ b/SpaceStudioClient/Content/Blueprints/NDPawn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e90ae0fc92ffb9a0587132bd59b66ea5e9457174c5ffd382344c34fa22bdfac9 -size 390569 +oid sha256:d9f5c9284613ed36ee7b858fbc5891e506830d33e56666ba7054e9a131345b16 +size 406042 diff --git a/SpaceStudioClient/Content/Blueprints/ND_PC.uasset b/SpaceStudioClient/Content/Blueprints/ND_PC.uasset index b1af0ca..6d442a0 100644 --- a/SpaceStudioClient/Content/Blueprints/ND_PC.uasset +++ b/SpaceStudioClient/Content/Blueprints/ND_PC.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50417ca2f759f3253a994b47c2b58a3a524563234c3fc14f3b8a1a03a315c8ce -size 854005 +oid sha256:09bda35c89645aa15858dabadb4af9fde7abca46fcb7e7438657465cbfd5bc38 +size 868134 diff --git a/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset b/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset index 77b9d6c..c2af84d 100644 --- a/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset +++ b/SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d1a70d3444e8bd86c0d0228d3f2e1f3dbb59a0c2efbadec9c22945edc522624 -size 629683 +oid sha256:0d5a87f9f96cee6f059a11c3b53ae1e671a74693be6f57474104725b856089a2 +size 633801 diff --git a/SpaceStudioClient/Content/Main.umap b/SpaceStudioClient/Content/Main.umap index 5327be9..95b948c 100644 --- a/SpaceStudioClient/Content/Main.umap +++ b/SpaceStudioClient/Content/Main.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c363ee5b28699e5d9784ba6a91e60ab7f30027831111757056fd354deacd2c1f -size 73035 +oid sha256:fabd102069d1ad386d6e9eec3bd6cc639ce69aa11a33c813986fd3fea598a212 +size 70247 diff --git a/SpaceStudioClient/Content/config.json b/SpaceStudioClient/Content/config.json index 6e2604e..0c66e37 100644 --- a/SpaceStudioClient/Content/config.json +++ b/SpaceStudioClient/Content/config.json @@ -1,6 +1,6 @@ { "master":true, - "ndisplay":false, + "ndisplay":true, "slaveIp":"127.0.0.1", "windowSize":{ "x":3840, @@ -9,6 +9,14 @@ "KinectOffset":{ "x":0, "y":0, - "z":0 + "z":1 + }, + "KinectRange":{ + "scale":0.5, + "xCenter":100, + "xMin":-100, + "xMax":100, + "yMin":-200, + "yMax":200 } } \ No newline at end of file