diff --git a/.gitignore b/.gitignore index fa615fe..84b6d6b 100755 --- a/.gitignore +++ b/.gitignore @@ -406,3 +406,6 @@ proj-web/build proj-windows/build public web_resources/ +pc_resources/ +resources_hd/ +web_resources_x2/ \ No newline at end of file diff --git a/resources/config/gameobjects_uni_interior_x.json b/resources/config/gameobjects_uni_interior_x.json index ab54783..af78102 100644 --- a/resources/config/gameobjects_uni_interior_x.json +++ b/resources/config/gameobjects_uni_interior_x.json @@ -185,8 +185,31 @@ { "name": "D_Books_005", "texturePath": "resources/w/exterior/texAtlas001.png", - "textureDarkandsPath": "resources/w/exterior/texAtlas001.png", - "meshPath": "resources/w/interior/D_Books_005.txt.bin", + "meshPath": "resources/w/interior/D_Books_006.txt.bin", + "rotationX": 0.0, + "rotationY": 0.0, + "rotationZ": 0.0, + "positionX": 0.0, + "positionY": -5.0, + "positionZ": 0.0, + "scale": 1.0 + }, + { + "name": "D_Books_part1_006", + "texturePath": "resources/w/exterior/texAtlas001.png", + "meshPath": "resources/w/interior/D_Books.001_006.txt.bin", + "rotationX": 0.0, + "rotationY": 0.0, + "rotationZ": 0.0, + "positionX": 0.0, + "positionY": -5.0, + "positionZ": 0.0, + "scale": 1.0 + }, + { + "name": "D_Books_part2_006", + "texturePath": "resources/w/exterior/texAtlas001.png", + "meshPath": "resources/w/interior/D_Books.002_006.txt.bin", "rotationX": 0.0, "rotationY": 0.0, "rotationZ": 0.0, @@ -198,7 +221,6 @@ { "name": "D_Folders_005", "texturePath": "resources/w/exterior/texAtlas001.png", - "textureDarkandsPath": "resources/w/exterior/texAtlas001.png", "meshPath": "resources/w/interior/D_Folders_005.txt.bin", "rotationX": 0.0, "rotationY": 0.0, @@ -211,7 +233,6 @@ { "name": "D_report_cards_005", "texturePath": "resources/w/exterior/texAtlas001.png", - "textureDarkandsPath": "resources/w/exterior/texAtlas001.png", "meshPath": "resources/w/interior/D_report_cards_005.txt.bin", "rotationX": 0.0, "rotationY": 0.0, diff --git a/resources/w/Cube_001.txt b/resources/w/Cube_001.txt deleted file mode 100644 index 5340039..0000000 --- a/resources/w/Cube_001.txt +++ /dev/null @@ -1,29 +0,0 @@ -===Vertices (Split by UV/Normal): 14 -V 0: Pos(-1.0, 1.0, 1.0) Norm(-0.577328, 0.577361, 0.577361) UV(0.875, 0.5) -V 1: Pos(1.0, -1.0, 1.0) Norm(0.577328, -0.577361, 0.577361) UV(0.625, 0.75) -V 2: Pos(1.0, 1.0, 1.0) Norm(0.577372, 0.577339, 0.577339) UV(0.625, 0.5) -V 3: Pos(-1.0, -1.0, -1.0) Norm(-0.577328, -0.577361, -0.577361) UV(0.375, 1.0) -V 4: Pos(1.0, -1.0, -1.0) Norm(0.577372, -0.577339, -0.577339) UV(0.375, 0.75) -V 5: Pos(-1.0, -1.0, 1.0) Norm(-0.577372, -0.577339, 0.577339) UV(0.625, 0.0) -V 6: Pos(-1.0, 1.0, -1.0) Norm(-0.577372, 0.577339, -0.577339) UV(0.375, 0.25) -V 7: Pos(-1.0, -1.0, -1.0) Norm(-0.577328, -0.577361, -0.577361) UV(0.375, 0.0) -V 8: Pos(1.0, 1.0, -1.0) Norm(0.577328, 0.577361, -0.577361) UV(0.375, 0.5) -V 9: Pos(-1.0, -1.0, -1.0) Norm(-0.577328, -0.577361, -0.577361) UV(0.125, 0.75) -V 10: Pos(-1.0, 1.0, -1.0) Norm(-0.577372, 0.577339, -0.577339) UV(0.125, 0.5) -V 11: Pos(-1.0, 1.0, 1.0) Norm(-0.577328, 0.577361, 0.577361) UV(0.625, 0.25) -V 12: Pos(-1.0, -1.0, 1.0) Norm(-0.577372, -0.577339, 0.577339) UV(0.875, 0.75) -V 13: Pos(-1.0, -1.0, 1.0) Norm(-0.577372, -0.577339, 0.577339) UV(0.625, 1.0) - -===Triangles (Indices): 12 -Tri: 0 1 2 -Tri: 1 3 4 -Tri: 5 6 7 -Tri: 8 9 10 -Tri: 2 4 8 -Tri: 11 8 6 -Tri: 0 12 1 -Tri: 1 13 3 -Tri: 5 11 6 -Tri: 8 4 9 -Tri: 2 1 4 -Tri: 11 2 8 diff --git a/resources/w/interior/D_Books.001_006.txt.bin b/resources/w/interior/D_Books.001_006.txt.bin new file mode 100644 index 0000000..5668fa0 Binary files /dev/null and b/resources/w/interior/D_Books.001_006.txt.bin differ diff --git a/resources/w/interior/D_Books.002_006.txt.bin b/resources/w/interior/D_Books.002_006.txt.bin new file mode 100644 index 0000000..05d67bd Binary files /dev/null and b/resources/w/interior/D_Books.002_006.txt.bin differ diff --git a/resources/w/interior/D_Books_005.txt.bin b/resources/w/interior/D_Books_006.txt.bin similarity index 52% rename from resources/w/interior/D_Books_005.txt.bin rename to resources/w/interior/D_Books_006.txt.bin index 602fbf9..6af6358 100644 Binary files a/resources/w/interior/D_Books_005.txt.bin and b/resources/w/interior/D_Books_006.txt.bin differ