diff --git a/AuvWorkbench/OperatingAreas/AutecOpArea.x3d b/AuvWorkbench/OperatingAreas/AutecOpArea.x3d index 21c5298c2e0e5082db6dbd8f18926a0be039621c..460ee92544758fde0d985f4cf55ad522cb130fcb 100644 --- a/AuvWorkbench/OperatingAreas/AutecOpArea.x3d +++ b/AuvWorkbench/OperatingAreas/AutecOpArea.x3d @@ -8,7 +8,7 @@ <meta content='Operations area top-level scene for AUTEC range Andros Island Bahamas, used by the AUV Workbench to build scenarios using unmanned vehicles.' name='description'/> <meta content='Don Brutzman, Terry Norbraten, Dale Tourtelotte' name='creator'/> <meta content='29 May 2009' name='created'/> - <meta content='20 October 2019' name='modified'/> + <meta content='6 December 2020' name='modified'/> <meta content='https://savage.nps.edu/Savage/AuvWorkbench/OperatingAreas/AutecOpArea.x3d' name='identifier'/> <meta content='X3D-Edit, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> @@ -16,6 +16,6 @@ <Scene> <!-- this scene is georeferenced --> <WorldInfo title='AutecOpArea.x3d'/> - <Inline url='"../../../SavageDefense/Locations/AUTEC/AUTEC.x3d" "https://SavageDefense.nps.navy.mil/SavageDefense/Locations/AUTEC/AUTEC.x3d" "../../../SavageDefense/Locations/AUTEC/AUTEC.wrl" "https://SavageDefense.nps.navy.mil/SavageDefense/Locations/AUTEC/AUTEC.wrl"'/> + <Inline url='"../../../SavageDefense/Locations/AUTEC/AUTEC.x3d" "https://SavageDefense.nps.edu/SavageDefense/Locations/AUTEC/AUTEC.x3d" "../../../SavageDefense/Locations/AUTEC/AUTEC.wrl" "https://SavageDefense.nps.edu/SavageDefense/Locations/AUTEC/AUTEC.wrl"'/> </Scene> </X3D> \ No newline at end of file diff --git a/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC/CNSGMIDPAC.vzx b/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC.vzx similarity index 100% rename from ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC/CNSGMIDPAC.vzx rename to ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC.vzx diff --git a/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC.x3d b/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC.x3d new file mode 100644 index 0000000000000000000000000000000000000000..661ad97fbd1b869881102e3ae673e519730ac1f5 --- /dev/null +++ b/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC.x3d @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "https://www.web3d.org/specifications/x3d-3.0.dtd"> +<X3D profile='Immersive' version='3.0' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='https://www.web3d.org/specifications/x3d-3.0.xsd'> + <head> + <meta content='CNSGMIDPAC.x3d' name='title'/> + <meta content='The ISIC seal for COMNAVSURFGRUMIDPAC that is affixed to surface ships' name='description'/> + <meta content='Patrick Sullivan' name='creator'/> + <meta content='20 February 2006' name='created'/> + <meta content='3 April 2021' name='modified'/> + <meta content='ISIC, ship markings' name='subject'/> + <meta content='https://savage.nps.edu/Savage/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC/CNSGMIDPAC.x3d' name='identifier'/> + <meta content='../../license.html' name='license'/> + </head> + <Scene> + <WorldInfo title='CNSGMIDPAC.x3d'/> + <Transform DEF='dad_GROUND'> + <Group DEF='GROUND'> + <Transform DEF='dad_DESRON31' rotation='1 0 0 1.571' translation='0 0 -.106'> + <Shape DEF='DESRON31'> + <Appearance> + <ImageTexture repeatS='false' repeatT='false' url='"MIDPAC.jpg" "https://savage.nps.edu/Savage/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC/MIDPAC.jpg"'/> + <TextureTransform center='-1.398 -.076' scale='.885 .977' translation='-.129 .013'/> + <Material DEF='Red_mat' diffuseColor='1 0 0'/> + </Appearance> + <IndexedFaceSet coordIndex='0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 34 65 33 -1 35 65 34 -1 36 65 35 -1 37 65 36 -1 38 65 37 -1 39 65 38 -1 40 65 39 -1 41 65 40 -1 42 65 41 -1 43 65 42 -1 44 65 43 -1 45 65 44 -1 46 65 45 -1 47 65 46 -1 48 65 47 -1 49 65 48 -1 50 65 49 -1 51 65 50 -1 52 65 51 -1 53 65 52 -1 54 65 53 -1 55 65 54 -1 56 65 55 -1 57 65 56 -1 58 65 57 -1 59 65 58 -1 60 65 59 -1 61 65 60 -1 62 65 61 -1 63 65 62 -1 64 65 63 -1 33 65 64 -1 0 34 33 -1 34 0 1 -1 1 35 34 -1 35 1 2 -1 2 36 35 -1 36 2 3 -1 3 37 36 -1 37 3 4 -1 4 38 37 -1 38 4 5 -1 5 39 38 -1 39 5 6 -1 6 40 39 -1 40 6 7 -1 7 41 40 -1 41 7 8 -1 8 42 41 -1 42 8 9 -1 9 43 42 -1 43 9 10 -1 10 44 43 -1 44 10 11 -1 11 45 44 -1 45 11 12 -1 12 46 45 -1 46 12 13 -1 13 47 46 -1 47 13 14 -1 14 48 47 -1 48 14 15 -1 15 49 48 -1 49 15 16 -1 16 50 49 -1 50 16 17 -1 17 51 50 -1 51 17 18 -1 18 52 51 -1 52 18 19 -1 19 53 52 -1 53 19 20 -1 20 54 53 -1 54 20 21 -1 21 55 54 -1 55 21 22 -1 22 56 55 -1 56 22 23 -1 23 57 56 -1 57 23 24 -1 24 58 57 -1 58 24 25 -1 25 59 58 -1 59 25 26 -1 26 60 59 -1 60 26 27 -1 27 61 60 -1 61 27 28 -1 28 62 61 -1 62 28 29 -1 29 63 62 -1 63 29 30 -1 30 64 63 -1 64 30 31 -1 31 33 64 -1 33 31 0 -1' creaseAngle='0.524' texCoordIndex='0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 15 32 16 -1 14 32 15 -1 13 32 14 -1 12 32 13 -1 11 32 12 -1 10 32 11 -1 9 32 10 -1 8 32 9 -1 7 32 8 -1 6 32 7 -1 5 32 6 -1 4 32 5 -1 3 32 4 -1 2 32 3 -1 1 32 2 -1 0 32 1 -1 31 32 0 -1 30 32 31 -1 29 32 30 -1 28 32 29 -1 27 32 28 -1 26 32 27 -1 25 32 26 -1 24 32 25 -1 23 32 24 -1 22 32 23 -1 21 32 22 -1 20 32 21 -1 19 32 20 -1 18 32 19 -1 17 32 18 -1 16 32 17 -1 33 67 66 -1 67 33 34 -1 34 68 67 -1 68 34 35 -1 35 69 68 -1 69 35 36 -1 36 70 69 -1 70 36 37 -1 37 71 70 -1 71 37 38 -1 38 72 71 -1 72 38 39 -1 39 73 72 -1 73 39 40 -1 40 74 73 -1 74 40 41 -1 41 75 74 -1 75 41 42 -1 42 76 75 -1 76 42 43 -1 43 77 76 -1 77 43 44 -1 44 78 77 -1 78 44 45 -1 45 79 78 -1 79 45 46 -1 46 80 79 -1 80 46 47 -1 47 81 80 -1 81 47 48 -1 48 82 81 -1 82 48 49 -1 49 83 82 -1 83 49 50 -1 50 84 83 -1 84 50 51 -1 51 85 84 -1 85 51 52 -1 52 86 85 -1 86 52 53 -1 53 87 86 -1 87 53 54 -1 54 88 87 -1 88 54 55 -1 55 89 88 -1 89 55 56 -1 56 90 89 -1 90 56 57 -1 57 91 90 -1 91 57 58 -1 58 92 91 -1 92 58 59 -1 59 93 92 -1 93 59 60 -1 60 94 93 -1 94 60 61 -1 61 95 94 -1 95 61 62 -1 62 96 95 -1 96 62 63 -1 63 97 96 -1 97 63 64 -1 64 98 97 -1 98 64 65 -1'> + <Coordinate point='0 .05 -.8 .16 .05 -.78 .31 .05 -.74 .44 .05 -.67 .57 .05 -.57 .67 .05 -.44 .74 .05 -.31 .78 .05 -.16 .8 .05 0 .78 .05 .16 .74 .05 .31 .67 .05 .44 .57 .05 .57 .44 .05 .67 .31 .05 .74 .16 .05 .78 -0 .05 .8 -.16 .05 .78 -.31 .05 .74 -.44 .05 .67 -.57 .05 .57 -.67 .05 .44 -.74 .05 .31 -.78 .05 .16 -.8 .05 -0 -.78 .05 -.16 -.74 .05 -.31 -.67 .05 -.44 -.57 .05 -.57 -.44 .05 -.67 -.31 .05 -.74 -.16 .05 -.78 0 .05 0 0 -.05 -.8 .16 -.05 -.78 .31 -.05 -.74 .44 -.05 -.67 .57 -.05 -.57 .67 -.05 -.44 .74 -.05 -.31 .78 -.05 -.16 .8 -.05 0 .78 -.05 .16 .74 -.05 .31 .67 -.05 .44 .57 -.05 .57 .44 -.05 .67 .31 -.05 .74 .16 -.05 .78 -0 -.05 .8 -.16 -.05 .78 -.31 -.05 .74 -.44 -.05 .67 -.57 -.05 .57 -.67 -.05 .44 -.74 -.05 .31 -.78 -.05 .16 -.8 -.05 -0 -.78 -.05 -.16 -.74 -.05 -.31 -.67 -.05 -.44 -.57 -.05 -.57 -.44 -.05 -.67 -.31 -.05 -.74 -.16 -.05 -.78 0 -.05 0'/> + <TextureCoordinate point='.5 1 .598 .99 .691 .962 .778 .916 .854 .854 .916 .778 .962 .691 .99 .598 1 .5 .99 .402 .962 .309 .916 .222 .854 .146 .778 .084 .691 .038 .598 .01 .5 0 .402 .01 .309 .038 .222 .084 .146 .146 .084 .222 .038 .309 .01 .402 0 .5 .01 .598 .038 .691 .084 .778 .146 .854 .222 .916 .309 .962 .402 .99 .5 .5 1 1 .969 1 .938 1 .906 1 .875 1 .844 1 .813 1 .781 1 .75 1 .719 1 .688 1 .656 1 .625 1 .594 1 .563 1 .531 1 .5 1 .469 1 .438 1 .406 1 .375 1 .344 1 .313 1 .281 1 .25 1 .219 1 .188 1 .156 1 .125 1 .094 1 .063 1 .031 1 0 1 1 0 .969 0 .938 0 .906 0 .875 0 .844 0 .813 0 .781 0 .75 0 .719 0 .688 0 .656 0 .625 0 .594 0 .563 0 .531 0 .5 0 .469 0 .438 0 .406 0 .375 0 .344 0 .313 0 .281 0 .25 0 .219 0 .188 0 .156 0 .125 0 .094 0 .063 0 .031 0 0 0'/> + </IndexedFaceSet> + </Shape> + </Transform> + </Group> + </Transform> + </Scene> +</X3D> \ No newline at end of file diff --git a/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC/CNSGMIDPAC.x3d b/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC/CNSGMIDPAC.x3d deleted file mode 100644 index 3319d0b965ad15bbfc779f4d840adff1ef6412aa..0000000000000000000000000000000000000000 --- a/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC/CNSGMIDPAC.x3d +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.1//EN" "https://www.web3d.org/specifications/x3d-3.1.dtd"> -<X3D profile='Immersive' version='3.0' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='https://www.web3d.org/specifications/x3d-3.0.xsd'> - <head> - <meta content='CNSGMIDPAC.x3d' name='title'/> - <meta content='The ISIC seal for COMNAVSURFGRUMIDPAC that is affixed to surface ships' name='description'/> - <meta content='Patrick Sullivan' name='creator'/> - <meta content='20 February 2006' name='created'/> - <meta content='30 July 2006' name='modified'/> - <meta content='1.0' name='version'/> - <meta content='ISIC, ship markings' name='subject'/> - <meta content='https://savage.nps.edu/Savage/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC/CNSGMIDPAC.x3d' name='identifier'/> - </head> - <Scene> - <Transform DEF='dad_GROUND'> - <Group DEF='GROUND'> - <Transform DEF='dad_DESRON31' rotation='1 0 0 1.571' translation='0 0 -.106'> - <Shape DEF='DESRON31'> - <Appearance> - <ImageTexture repeatS='false' repeatT='false' url='"MIDPAC.jpg" "https://savage.nps.edu/Savage/ModelDetailing/MilitaryCrestsAndSeals/CNSGMIDPAC/MIDPAC.jpg"'/> - <TextureTransform center='-1.398 -.076' scale='.885 .977' translation='-.129 .013'/> - <Material DEF='Red_mat' diffuseColor='1 0 0' shininess='0.2'/> - </Appearance> - <IndexedFaceSet coordIndex=' 0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 34 65 33 -1 35 65 34 -1 36 65 35 -1 37 65 36 -1 38 65 37 -1 39 65 38 -1 40 65 39 -1 41 65 40 -1 42 65 41 -1 43 65 42 -1 44 65 43 -1 45 65 44 -1 46 65 45 -1 47 65 46 -1 48 65 47 -1 49 65 48 -1 50 65 49 -1 51 65 50 -1 52 65 51 -1 53 65 52 -1 54 65 53 -1 55 65 54 -1 56 65 55 -1 57 65 56 -1 58 65 57 -1 59 65 58 -1 60 65 59 -1 61 65 60 -1 62 65 61 -1 63 65 62 -1 64 65 63 -1 33 65 64 -1 0 34 33 -1 34 0 1 -1 1 35 34 -1 35 1 2 -1 2 36 35 -1 36 2 3 -1 3 37 36 -1 37 3 4 -1 4 38 37 -1 38 4 5 -1 5 39 38 -1 39 5 6 -1 6 40 39 -1 40 6 7 -1 7 41 40 -1 41 7 8 -1 8 42 41 -1 42 8 9 -1 9 43 42 -1 43 9 10 -1 10 44 43 -1 44 10 11 -1 11 45 44 -1 45 11 12 -1 12 46 45 -1 46 12 13 -1 13 47 46 -1 47 13 14 -1 14 48 47 -1 48 14 15 -1 15 49 48 -1 49 15 16 -1 16 50 49 -1 50 16 17 -1 17 51 50 -1 51 17 18 -1 18 52 51 -1 52 18 19 -1 19 53 52 -1 53 19 20 -1 20 54 53 -1 54 20 21 -1 21 55 54 -1 55 21 22 -1 22 56 55 -1 56 22 23 -1 23 57 56 -1 57 23 24 -1 24 58 57 -1 58 24 25 -1 25 59 58 -1 59 25 26 -1 26 60 59 -1 60 26 27 -1 27 61 60 -1 61 27 28 -1 28 62 61 -1 62 28 29 -1 29 63 62 -1 63 29 30 -1 30 64 63 -1 64 30 31 -1 31 33 64 -1 33 31 0 -1 ' creaseAngle='0.524' texCoordIndex=' 0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 15 32 16 -1 14 32 15 -1 13 32 14 -1 12 32 13 -1 11 32 12 -1 10 32 11 -1 9 32 10 -1 8 32 9 -1 7 32 8 -1 6 32 7 -1 5 32 6 -1 4 32 5 -1 3 32 4 -1 2 32 3 -1 1 32 2 -1 0 32 1 -1 31 32 0 -1 30 32 31 -1 29 32 30 -1 28 32 29 -1 27 32 28 -1 26 32 27 -1 25 32 26 -1 24 32 25 -1 23 32 24 -1 22 32 23 -1 21 32 22 -1 20 32 21 -1 19 32 20 -1 18 32 19 -1 17 32 18 -1 16 32 17 -1 33 67 66 -1 67 33 34 -1 34 68 67 -1 68 34 35 -1 35 69 68 -1 69 35 36 -1 36 70 69 -1 70 36 37 -1 37 71 70 -1 71 37 38 -1 38 72 71 -1 72 38 39 -1 39 73 72 -1 73 39 40 -1 40 74 73 -1 74 40 41 -1 41 75 74 -1 75 41 42 -1 42 76 75 -1 76 42 43 -1 43 77 76 -1 77 43 44 -1 44 78 77 -1 78 44 45 -1 45 79 78 -1 79 45 46 -1 46 80 79 -1 80 46 47 -1 47 81 80 -1 81 47 48 -1 48 82 81 -1 82 48 49 -1 49 83 82 -1 83 49 50 -1 50 84 83 -1 84 50 51 -1 51 85 84 -1 85 51 52 -1 52 86 85 -1 86 52 53 -1 53 87 86 -1 87 53 54 -1 54 88 87 -1 88 54 55 -1 55 89 88 -1 89 55 56 -1 56 90 89 -1 90 56 57 -1 57 91 90 -1 91 57 58 -1 58 92 91 -1 92 58 59 -1 59 93 92 -1 93 59 60 -1 60 94 93 -1 94 60 61 -1 61 95 94 -1 95 61 62 -1 62 96 95 -1 96 62 63 -1 63 97 96 -1 97 63 64 -1 64 98 97 -1 98 64 65 -1 '> - <Coordinate point=' 0 .05 -.8 .16 .05 -.78 .31 .05 -.74 .44 .05 -.67 .57 .05 -.57 .67 .05 -.44 .74 .05 -.31 .78 .05 -.16 .8 .05 0 .78 .05 .16 .74 .05 .31 .67 .05 .44 .57 .05 .57 .44 .05 .67 .31 .05 .74 .16 .05 .78 -0 .05 .8 -.16 .05 .78 -.31 .05 .74 -.44 .05 .67 -.57 .05 .57 -.67 .05 .44 -.74 .05 .31 -.78 .05 .16 -.8 .05 -0 -.78 .05 -.16 -.74 .05 -.31 -.67 .05 -.44 -.57 .05 -.57 -.44 .05 -.67 -.31 .05 -.74 -.16 .05 -.78 0 .05 0 0 -.05 -.8 .16 -.05 -.78 .31 -.05 -.74 .44 -.05 -.67 .57 -.05 -.57 .67 -.05 -.44 .74 -.05 -.31 .78 -.05 -.16 .8 -.05 0 .78 -.05 .16 .74 -.05 .31 .67 -.05 .44 .57 -.05 .57 .44 -.05 .67 .31 -.05 .74 .16 -.05 .78 -0 -.05 .8 -.16 -.05 .78 -.31 -.05 .74 -.44 -.05 .67 -.57 -.05 .57 -.67 -.05 .44 -.74 -.05 .31 -.78 -.05 .16 -.8 -.05 -0 -.78 -.05 -.16 -.74 -.05 -.31 -.67 -.05 -.44 -.57 -.05 -.57 -.44 -.05 -.67 -.31 -.05 -.74 -.16 -.05 -.78 0 -.05 0 '/> - <TextureCoordinate point=' .5 1 .598 .99 .691 .962 .778 .916 .854 .854 .916 .778 .962 .691 .99 .598 1 .5 .99 .402 .962 .309 .916 .222 .854 .146 .778 .084 .691 .038 .598 .01 .5 0 .402 .01 .309 .038 .222 .084 .146 .146 .084 .222 .038 .309 .01 .402 0 .5 .01 .598 .038 .691 .084 .778 .146 .854 .222 .916 .309 .962 .402 .99 .5 .5 1 1 .969 1 .938 1 .906 1 .875 1 .844 1 .813 1 .781 1 .75 1 .719 1 .688 1 .656 1 .625 1 .594 1 .563 1 .531 1 .5 1 .469 1 .438 1 .406 1 .375 1 .344 1 .313 1 .281 1 .25 1 .219 1 .188 1 .156 1 .125 1 .094 1 .063 1 .031 1 0 1 1 0 .969 0 .938 0 .906 0 .875 0 .844 0 .813 0 .781 0 .75 0 .719 0 .688 0 .656 0 .625 0 .594 0 .563 0 .531 0 .5 0 .469 0 .438 0 .406 0 .375 0 .344 0 .313 0 .281 0 .25 0 .219 0 .188 0 .156 0 .125 0 .094 0 .063 0 .031 0 0 0 '/> - </IndexedFaceSet> - </Shape> - </Transform> - </Group> - </Transform> - </Scene> -</X3D> diff --git a/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON31.x3d b/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON31.x3d new file mode 100644 index 0000000000000000000000000000000000000000..b835a7e8e6ccceec976e2918979cff3ee4808782 --- /dev/null +++ b/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON31.x3d @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "https://www.web3d.org/specifications/x3d-3.0.dtd"> +<X3D profile='Immersive' version='3.0' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='https://www.web3d.org/specifications/x3d-3.0.xsd'> + <head> + <meta content='COMDESRON31' name='title'/> + <meta content='Thumb_COMDESRON31_x3d58303181148874576.jpg' name='Vizthumbnail'/> + <meta content='../license.html' name='license'/> + </head> + <Scene> + <WorldInfo info='"This Web3D World was created with Vizx3D, a Web3D authoring tool" "www.vizx3d.com"' title='DESRON31Starboard'/> + <Transform DEF='dad_GROUND'> + <Group DEF='GROUND'> + <Transform DEF='dad_DESRON32' rotation='-1 0 0 1.571'> + <Shape DEF='DESRON32'> + <Appearance> + <ImageTexture repeatS='false' repeatT='false' url='"newsealtest.jpg"'/> + <TextureTransform center='-1.092 -.057' scale='.912 .981' translation='-.086 .009'/> + <Material DEF='Red_mat' diffuseColor='1 0 0'/> + </Appearance> + <IndexedFaceSet coordIndex='0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 34 65 33 -1 35 65 34 -1 36 65 35 -1 37 65 36 -1 38 65 37 -1 39 65 38 -1 40 65 39 -1 41 65 40 -1 42 65 41 -1 43 65 42 -1 44 65 43 -1 45 65 44 -1 46 65 45 -1 47 65 46 -1 48 65 47 -1 49 65 48 -1 50 65 49 -1 51 65 50 -1 52 65 51 -1 53 65 52 -1 54 65 53 -1 55 65 54 -1 56 65 55 -1 57 65 56 -1 58 65 57 -1 59 65 58 -1 60 65 59 -1 61 65 60 -1 62 65 61 -1 63 65 62 -1 64 65 63 -1 33 65 64 -1 0 34 33 -1 34 0 1 -1 1 35 34 -1 35 1 2 -1 2 36 35 -1 36 2 3 -1 3 37 36 -1 37 3 4 -1 4 38 37 -1 38 4 5 -1 5 39 38 -1 39 5 6 -1 6 40 39 -1 40 6 7 -1 7 41 40 -1 41 7 8 -1 8 42 41 -1 42 8 9 -1 9 43 42 -1 43 9 10 -1 10 44 43 -1 44 10 11 -1 11 45 44 -1 45 11 12 -1 12 46 45 -1 46 12 13 -1 13 47 46 -1 47 13 14 -1 14 48 47 -1 48 14 15 -1 15 49 48 -1 49 15 16 -1 16 50 49 -1 50 16 17 -1 17 51 50 -1 51 17 18 -1 18 52 51 -1 52 18 19 -1 19 53 52 -1 53 19 20 -1 20 54 53 -1 54 20 21 -1 21 55 54 -1 55 21 22 -1 22 56 55 -1 56 22 23 -1 23 57 56 -1 57 23 24 -1 24 58 57 -1 58 24 25 -1 25 59 58 -1 59 25 26 -1 26 60 59 -1 60 26 27 -1 27 61 60 -1 61 27 28 -1 28 62 61 -1 62 28 29 -1 29 63 62 -1 63 29 30 -1 30 64 63 -1 64 30 31 -1 31 33 64 -1 33 31 0 -1' creaseAngle='0.524' texCoordIndex='0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 15 32 16 -1 14 32 15 -1 13 32 14 -1 12 32 13 -1 11 32 12 -1 10 32 11 -1 9 32 10 -1 8 32 9 -1 7 32 8 -1 6 32 7 -1 5 32 6 -1 4 32 5 -1 3 32 4 -1 2 32 3 -1 1 32 2 -1 0 32 1 -1 31 32 0 -1 30 32 31 -1 29 32 30 -1 28 32 29 -1 27 32 28 -1 26 32 27 -1 25 32 26 -1 24 32 25 -1 23 32 24 -1 22 32 23 -1 21 32 22 -1 20 32 21 -1 19 32 20 -1 18 32 19 -1 17 32 18 -1 16 32 17 -1 33 67 66 -1 67 33 34 -1 34 68 67 -1 68 34 35 -1 35 69 68 -1 69 35 36 -1 36 70 69 -1 70 36 37 -1 37 71 70 -1 71 37 38 -1 38 72 71 -1 72 38 39 -1 39 73 72 -1 73 39 40 -1 40 74 73 -1 74 40 41 -1 41 75 74 -1 75 41 42 -1 42 76 75 -1 76 42 43 -1 43 77 76 -1 77 43 44 -1 44 78 77 -1 78 44 45 -1 45 79 78 -1 79 45 46 -1 46 80 79 -1 80 46 47 -1 47 81 80 -1 81 47 48 -1 48 82 81 -1 82 48 49 -1 49 83 82 -1 83 49 50 -1 50 84 83 -1 84 50 51 -1 51 85 84 -1 85 51 52 -1 52 86 85 -1 86 52 53 -1 53 87 86 -1 87 53 54 -1 54 88 87 -1 88 54 55 -1 55 89 88 -1 89 55 56 -1 56 90 89 -1 90 56 57 -1 57 91 90 -1 91 57 58 -1 58 92 91 -1 92 58 59 -1 59 93 92 -1 93 59 60 -1 60 94 93 -1 94 60 61 -1 61 95 94 -1 95 61 62 -1 62 96 95 -1 96 62 63 -1 63 97 96 -1 97 63 64 -1 64 98 97 -1 98 64 65 -1'> + <Coordinate point='0 .05 -.8 .16 .05 -.78 .31 .05 -.74 .44 .05 -.67 .57 .05 -.57 .67 .05 -.44 .74 .05 -.31 .78 .05 -.16 .8 .05 0 .78 .05 .16 .74 .05 .31 .67 .05 .44 .57 .05 .57 .44 .05 .67 .31 .05 .74 .16 .05 .78 -0 .05 .8 -.16 .05 .78 -.31 .05 .74 -.44 .05 .67 -.57 .05 .57 -.67 .05 .44 -.74 .05 .31 -.78 .05 .16 -.8 .05 -0 -.78 .05 -.16 -.74 .05 -.31 -.67 .05 -.44 -.57 .05 -.57 -.44 .05 -.67 -.31 .05 -.74 -.16 .05 -.78 0 .05 0 0 -.05 -.8 .16 -.05 -.78 .31 -.05 -.74 .44 -.05 -.67 .57 -.05 -.57 .67 -.05 -.44 .74 -.05 -.31 .78 -.05 -.16 .8 -.05 0 .78 -.05 .16 .74 -.05 .31 .67 -.05 .44 .57 -.05 .57 .44 -.05 .67 .31 -.05 .74 .16 -.05 .78 -0 -.05 .8 -.16 -.05 .78 -.31 -.05 .74 -.44 -.05 .67 -.57 -.05 .57 -.67 -.05 .44 -.74 -.05 .31 -.78 -.05 .16 -.8 -.05 -0 -.78 -.05 -.16 -.74 -.05 -.31 -.67 -.05 -.44 -.57 -.05 -.57 -.44 -.05 -.67 -.31 -.05 -.74 -.16 -.05 -.78 0 -.05 0'/> + <TextureCoordinate point='.5 1 .598 .99 .691 .962 .778 .916 .854 .854 .916 .778 .962 .691 .99 .598 1 .5 .99 .402 .962 .309 .916 .222 .854 .146 .778 .084 .691 .038 .598 .01 .5 0 .402 .01 .309 .038 .222 .084 .146 .146 .084 .222 .038 .309 .01 .402 0 .5 .01 .598 .038 .691 .084 .778 .146 .854 .222 .916 .309 .962 .402 .99 .5 .5 1 1 .969 1 .938 1 .906 1 .875 1 .844 1 .813 1 .781 1 .75 1 .719 1 .688 1 .656 1 .625 1 .594 1 .563 1 .531 1 .5 1 .469 1 .438 1 .406 1 .375 1 .344 1 .313 1 .281 1 .25 1 .219 1 .188 1 .156 1 .125 1 .094 1 .063 1 .031 1 0 1 1 0 .969 0 .938 0 .906 0 .875 0 .844 0 .813 0 .781 0 .75 0 .719 0 .688 0 .656 0 .625 0 .594 0 .563 0 .531 0 .5 0 .469 0 .438 0 .406 0 .375 0 .344 0 .313 0 .281 0 .25 0 .219 0 .188 0 .156 0 .125 0 .094 0 .063 0 .031 0 0 0'/> + </IndexedFaceSet> + </Shape> + </Transform> + </Group> + </Transform> + </Scene> +</X3D> \ No newline at end of file diff --git a/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON31/COMDESRON31.x3d b/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON31/COMDESRON31.x3d deleted file mode 100644 index 5922c2c23ab29854b88ad50b29ad07e2509ce829..0000000000000000000000000000000000000000 --- a/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON31/COMDESRON31.x3d +++ /dev/null @@ -1,453 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "https://www.web3d.org/specifications/x3d-3.0.dtd"> -<X3D profile='Immersive' version='3.0'> - <head> - <meta name='Vizthumbnail' key='Thumb_COMDESRON31_x3d58303181148874576.jpg'/> - </head> - <Scene> - <WorldInfo title='DESRON31Starboard' info='"This Web3D World was created with Vizx3D, a Web3D authoring tool" -"www.vizx3d.com"'/> - <Transform DEF='dad_GROUND'> - <Group DEF='GROUND'> - <Transform DEF='dad_DESRON32' rotation='-1 0 0 1.571'> - <Shape DEF='DESRON32'> - <Appearance> - <ImageTexture repeatS='false' repeatT='false' url='"newsealtest.jpg"'/> - <TextureTransform scale='.912 .981' translation='-.086 .009' center='-1.092 -.057'/> - <Material DEF='Red_mat' diffuseColor='1 0 0' shininess='0.2'/> - </Appearance> - <IndexedFaceSet creaseAngle='0.524' coordIndex=' - 0 32 1 -1 - 1 32 2 -1 - 2 32 3 -1 - 3 32 4 -1 - 4 32 5 -1 - 5 32 6 -1 - 6 32 7 -1 - 7 32 8 -1 - 8 32 9 -1 - 9 32 10 -1 - 10 32 11 -1 - 11 32 12 -1 - 12 32 13 -1 - 13 32 14 -1 - 14 32 15 -1 - 15 32 16 -1 - 16 32 17 -1 - 17 32 18 -1 - 18 32 19 -1 - 19 32 20 -1 - 20 32 21 -1 - 21 32 22 -1 - 22 32 23 -1 - 23 32 24 -1 - 24 32 25 -1 - 25 32 26 -1 - 26 32 27 -1 - 27 32 28 -1 - 28 32 29 -1 - 29 32 30 -1 - 30 32 31 -1 - 31 32 0 -1 - 34 65 33 -1 - 35 65 34 -1 - 36 65 35 -1 - 37 65 36 -1 - 38 65 37 -1 - 39 65 38 -1 - 40 65 39 -1 - 41 65 40 -1 - 42 65 41 -1 - 43 65 42 -1 - 44 65 43 -1 - 45 65 44 -1 - 46 65 45 -1 - 47 65 46 -1 - 48 65 47 -1 - 49 65 48 -1 - 50 65 49 -1 - 51 65 50 -1 - 52 65 51 -1 - 53 65 52 -1 - 54 65 53 -1 - 55 65 54 -1 - 56 65 55 -1 - 57 65 56 -1 - 58 65 57 -1 - 59 65 58 -1 - 60 65 59 -1 - 61 65 60 -1 - 62 65 61 -1 - 63 65 62 -1 - 64 65 63 -1 - 33 65 64 -1 - 0 34 33 -1 - 34 0 1 -1 - 1 35 34 -1 - 35 1 2 -1 - 2 36 35 -1 - 36 2 3 -1 - 3 37 36 -1 - 37 3 4 -1 - 4 38 37 -1 - 38 4 5 -1 - 5 39 38 -1 - 39 5 6 -1 - 6 40 39 -1 - 40 6 7 -1 - 7 41 40 -1 - 41 7 8 -1 - 8 42 41 -1 - 42 8 9 -1 - 9 43 42 -1 - 43 9 10 -1 - 10 44 43 -1 - 44 10 11 -1 - 11 45 44 -1 - 45 11 12 -1 - 12 46 45 -1 - 46 12 13 -1 - 13 47 46 -1 - 47 13 14 -1 - 14 48 47 -1 - 48 14 15 -1 - 15 49 48 -1 - 49 15 16 -1 - 16 50 49 -1 - 50 16 17 -1 - 17 51 50 -1 - 51 17 18 -1 - 18 52 51 -1 - 52 18 19 -1 - 19 53 52 -1 - 53 19 20 -1 - 20 54 53 -1 - 54 20 21 -1 - 21 55 54 -1 - 55 21 22 -1 - 22 56 55 -1 - 56 22 23 -1 - 23 57 56 -1 - 57 23 24 -1 - 24 58 57 -1 - 58 24 25 -1 - 25 59 58 -1 - 59 25 26 -1 - 26 60 59 -1 - 60 26 27 -1 - 27 61 60 -1 - 61 27 28 -1 - 28 62 61 -1 - 62 28 29 -1 - 29 63 62 -1 - 63 29 30 -1 - 30 64 63 -1 - 64 30 31 -1 - 31 33 64 -1 - 33 31 0 -1 -' texCoordIndex=' - 0 32 1 -1 - 1 32 2 -1 - 2 32 3 -1 - 3 32 4 -1 - 4 32 5 -1 - 5 32 6 -1 - 6 32 7 -1 - 7 32 8 -1 - 8 32 9 -1 - 9 32 10 -1 - 10 32 11 -1 - 11 32 12 -1 - 12 32 13 -1 - 13 32 14 -1 - 14 32 15 -1 - 15 32 16 -1 - 16 32 17 -1 - 17 32 18 -1 - 18 32 19 -1 - 19 32 20 -1 - 20 32 21 -1 - 21 32 22 -1 - 22 32 23 -1 - 23 32 24 -1 - 24 32 25 -1 - 25 32 26 -1 - 26 32 27 -1 - 27 32 28 -1 - 28 32 29 -1 - 29 32 30 -1 - 30 32 31 -1 - 31 32 0 -1 - 15 32 16 -1 - 14 32 15 -1 - 13 32 14 -1 - 12 32 13 -1 - 11 32 12 -1 - 10 32 11 -1 - 9 32 10 -1 - 8 32 9 -1 - 7 32 8 -1 - 6 32 7 -1 - 5 32 6 -1 - 4 32 5 -1 - 3 32 4 -1 - 2 32 3 -1 - 1 32 2 -1 - 0 32 1 -1 - 31 32 0 -1 - 30 32 31 -1 - 29 32 30 -1 - 28 32 29 -1 - 27 32 28 -1 - 26 32 27 -1 - 25 32 26 -1 - 24 32 25 -1 - 23 32 24 -1 - 22 32 23 -1 - 21 32 22 -1 - 20 32 21 -1 - 19 32 20 -1 - 18 32 19 -1 - 17 32 18 -1 - 16 32 17 -1 - 33 67 66 -1 - 67 33 34 -1 - 34 68 67 -1 - 68 34 35 -1 - 35 69 68 -1 - 69 35 36 -1 - 36 70 69 -1 - 70 36 37 -1 - 37 71 70 -1 - 71 37 38 -1 - 38 72 71 -1 - 72 38 39 -1 - 39 73 72 -1 - 73 39 40 -1 - 40 74 73 -1 - 74 40 41 -1 - 41 75 74 -1 - 75 41 42 -1 - 42 76 75 -1 - 76 42 43 -1 - 43 77 76 -1 - 77 43 44 -1 - 44 78 77 -1 - 78 44 45 -1 - 45 79 78 -1 - 79 45 46 -1 - 46 80 79 -1 - 80 46 47 -1 - 47 81 80 -1 - 81 47 48 -1 - 48 82 81 -1 - 82 48 49 -1 - 49 83 82 -1 - 83 49 50 -1 - 50 84 83 -1 - 84 50 51 -1 - 51 85 84 -1 - 85 51 52 -1 - 52 86 85 -1 - 86 52 53 -1 - 53 87 86 -1 - 87 53 54 -1 - 54 88 87 -1 - 88 54 55 -1 - 55 89 88 -1 - 89 55 56 -1 - 56 90 89 -1 - 90 56 57 -1 - 57 91 90 -1 - 91 57 58 -1 - 58 92 91 -1 - 92 58 59 -1 - 59 93 92 -1 - 93 59 60 -1 - 60 94 93 -1 - 94 60 61 -1 - 61 95 94 -1 - 95 61 62 -1 - 62 96 95 -1 - 96 62 63 -1 - 63 97 96 -1 - 97 63 64 -1 - 64 98 97 -1 - 98 64 65 -1 -'> - <Coordinate point=' -0 .05 -.8 -.16 .05 -.78 -.31 .05 -.74 -.44 .05 -.67 -.57 .05 -.57 -.67 .05 -.44 -.74 .05 -.31 -.78 .05 -.16 -.8 .05 0 -.78 .05 .16 -.74 .05 .31 -.67 .05 .44 -.57 .05 .57 -.44 .05 .67 -.31 .05 .74 -.16 .05 .78 --0 .05 .8 --.16 .05 .78 --.31 .05 .74 --.44 .05 .67 --.57 .05 .57 --.67 .05 .44 --.74 .05 .31 --.78 .05 .16 --.8 .05 -0 --.78 .05 -.16 --.74 .05 -.31 --.67 .05 -.44 --.57 .05 -.57 --.44 .05 -.67 --.31 .05 -.74 --.16 .05 -.78 -0 .05 0 -0 -.05 -.8 -.16 -.05 -.78 -.31 -.05 -.74 -.44 -.05 -.67 -.57 -.05 -.57 -.67 -.05 -.44 -.74 -.05 -.31 -.78 -.05 -.16 -.8 -.05 0 -.78 -.05 .16 -.74 -.05 .31 -.67 -.05 .44 -.57 -.05 .57 -.44 -.05 .67 -.31 -.05 .74 -.16 -.05 .78 --0 -.05 .8 --.16 -.05 .78 --.31 -.05 .74 --.44 -.05 .67 --.57 -.05 .57 --.67 -.05 .44 --.74 -.05 .31 --.78 -.05 .16 --.8 -.05 -0 --.78 -.05 -.16 --.74 -.05 -.31 --.67 -.05 -.44 --.57 -.05 -.57 --.44 -.05 -.67 --.31 -.05 -.74 --.16 -.05 -.78 -0 -.05 0 -'/> - <TextureCoordinate point=' -.5 1 -.598 .99 -.691 .962 -.778 .916 -.854 .854 -.916 .778 -.962 .691 -.99 .598 -1 .5 -.99 .402 -.962 .309 -.916 .222 -.854 .146 -.778 .084 -.691 .038 -.598 .01 -.5 0 -.402 .01 -.309 .038 -.222 .084 -.146 .146 -.084 .222 -.038 .309 -.01 .402 -0 .5 -.01 .598 -.038 .691 -.084 .778 -.146 .854 -.222 .916 -.309 .962 -.402 .99 -.5 .5 -1 1 -.969 1 -.938 1 -.906 1 -.875 1 -.844 1 -.813 1 -.781 1 -.75 1 -.719 1 -.688 1 -.656 1 -.625 1 -.594 1 -.563 1 -.531 1 -.5 1 -.469 1 -.438 1 -.406 1 -.375 1 -.344 1 -.313 1 -.281 1 -.25 1 -.219 1 -.188 1 -.156 1 -.125 1 -.094 1 -.063 1 -.031 1 -0 1 -1 0 -.969 0 -.938 0 -.906 0 -.875 0 -.844 0 -.813 0 -.781 0 -.75 0 -.719 0 -.688 0 -.656 0 -.625 0 -.594 0 -.563 0 -.531 0 -.5 0 -.469 0 -.438 0 -.406 0 -.375 0 -.344 0 -.313 0 -.281 0 -.25 0 -.219 0 -.188 0 -.156 0 -.125 0 -.094 0 -.063 0 -.031 0 -0 0 -'/> - </IndexedFaceSet> - </Shape> - </Transform> - </Group> - </Transform> - </Scene> -</X3D> diff --git a/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON31/DESRON31Test.x3d b/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON31/DESRON31Test.x3d deleted file mode 100644 index 1a8637de2d8952b971ca7d193ccb888584004700..0000000000000000000000000000000000000000 --- a/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON31/DESRON31Test.x3d +++ /dev/null @@ -1,899 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "https://www.web3d.org/specifications/x3d-3.0.dtd"> -<X3D profile='Immersive' version='3.0'> - <head> - <meta name='Vizthumbnail' key='Thumb_DESRON31Test_x3d47572691148873503.jpg'/> - </head> - <Scene> - <WorldInfo title='DESRON31Starboard' info='"This Web3D World was created with Vizx3D, a Web3D authoring tool" -"www.vizx3d.com"'/> - <Transform DEF='dad_GROUND'> - <Group DEF='GROUND'> - <Transform DEF='dad_DESRON32' rotation='-1 0 0 1.571' translation='-2.78641 -.50063 0'> - <Shape DEF='DESRON32'> - <Appearance> - <ImageTexture repeatS='false' repeatT='false' url='"newsealtest.jpg"'/> - <TextureTransform scale='.912 .981' translation='-.086 .009' center='-1.092 -.057'/> - <Material DEF='Red_mat' diffuseColor='1 0 0' shininess='0.2'/> - </Appearance> - <IndexedFaceSet creaseAngle='0.524' coordIndex=' - 0 32 1 -1 - 1 32 2 -1 - 2 32 3 -1 - 3 32 4 -1 - 4 32 5 -1 - 5 32 6 -1 - 6 32 7 -1 - 7 32 8 -1 - 8 32 9 -1 - 9 32 10 -1 - 10 32 11 -1 - 11 32 12 -1 - 12 32 13 -1 - 13 32 14 -1 - 14 32 15 -1 - 15 32 16 -1 - 16 32 17 -1 - 17 32 18 -1 - 18 32 19 -1 - 19 32 20 -1 - 20 32 21 -1 - 21 32 22 -1 - 22 32 23 -1 - 23 32 24 -1 - 24 32 25 -1 - 25 32 26 -1 - 26 32 27 -1 - 27 32 28 -1 - 28 32 29 -1 - 29 32 30 -1 - 30 32 31 -1 - 31 32 0 -1 - 34 65 33 -1 - 35 65 34 -1 - 36 65 35 -1 - 37 65 36 -1 - 38 65 37 -1 - 39 65 38 -1 - 40 65 39 -1 - 41 65 40 -1 - 42 65 41 -1 - 43 65 42 -1 - 44 65 43 -1 - 45 65 44 -1 - 46 65 45 -1 - 47 65 46 -1 - 48 65 47 -1 - 49 65 48 -1 - 50 65 49 -1 - 51 65 50 -1 - 52 65 51 -1 - 53 65 52 -1 - 54 65 53 -1 - 55 65 54 -1 - 56 65 55 -1 - 57 65 56 -1 - 58 65 57 -1 - 59 65 58 -1 - 60 65 59 -1 - 61 65 60 -1 - 62 65 61 -1 - 63 65 62 -1 - 64 65 63 -1 - 33 65 64 -1 - 0 34 33 -1 - 34 0 1 -1 - 1 35 34 -1 - 35 1 2 -1 - 2 36 35 -1 - 36 2 3 -1 - 3 37 36 -1 - 37 3 4 -1 - 4 38 37 -1 - 38 4 5 -1 - 5 39 38 -1 - 39 5 6 -1 - 6 40 39 -1 - 40 6 7 -1 - 7 41 40 -1 - 41 7 8 -1 - 8 42 41 -1 - 42 8 9 -1 - 9 43 42 -1 - 43 9 10 -1 - 10 44 43 -1 - 44 10 11 -1 - 11 45 44 -1 - 45 11 12 -1 - 12 46 45 -1 - 46 12 13 -1 - 13 47 46 -1 - 47 13 14 -1 - 14 48 47 -1 - 48 14 15 -1 - 15 49 48 -1 - 49 15 16 -1 - 16 50 49 -1 - 50 16 17 -1 - 17 51 50 -1 - 51 17 18 -1 - 18 52 51 -1 - 52 18 19 -1 - 19 53 52 -1 - 53 19 20 -1 - 20 54 53 -1 - 54 20 21 -1 - 21 55 54 -1 - 55 21 22 -1 - 22 56 55 -1 - 56 22 23 -1 - 23 57 56 -1 - 57 23 24 -1 - 24 58 57 -1 - 58 24 25 -1 - 25 59 58 -1 - 59 25 26 -1 - 26 60 59 -1 - 60 26 27 -1 - 27 61 60 -1 - 61 27 28 -1 - 28 62 61 -1 - 62 28 29 -1 - 29 63 62 -1 - 63 29 30 -1 - 30 64 63 -1 - 64 30 31 -1 - 31 33 64 -1 - 33 31 0 -1 -' texCoordIndex=' - 0 32 1 -1 - 1 32 2 -1 - 2 32 3 -1 - 3 32 4 -1 - 4 32 5 -1 - 5 32 6 -1 - 6 32 7 -1 - 7 32 8 -1 - 8 32 9 -1 - 9 32 10 -1 - 10 32 11 -1 - 11 32 12 -1 - 12 32 13 -1 - 13 32 14 -1 - 14 32 15 -1 - 15 32 16 -1 - 16 32 17 -1 - 17 32 18 -1 - 18 32 19 -1 - 19 32 20 -1 - 20 32 21 -1 - 21 32 22 -1 - 22 32 23 -1 - 23 32 24 -1 - 24 32 25 -1 - 25 32 26 -1 - 26 32 27 -1 - 27 32 28 -1 - 28 32 29 -1 - 29 32 30 -1 - 30 32 31 -1 - 31 32 0 -1 - 15 32 16 -1 - 14 32 15 -1 - 13 32 14 -1 - 12 32 13 -1 - 11 32 12 -1 - 10 32 11 -1 - 9 32 10 -1 - 8 32 9 -1 - 7 32 8 -1 - 6 32 7 -1 - 5 32 6 -1 - 4 32 5 -1 - 3 32 4 -1 - 2 32 3 -1 - 1 32 2 -1 - 0 32 1 -1 - 31 32 0 -1 - 30 32 31 -1 - 29 32 30 -1 - 28 32 29 -1 - 27 32 28 -1 - 26 32 27 -1 - 25 32 26 -1 - 24 32 25 -1 - 23 32 24 -1 - 22 32 23 -1 - 21 32 22 -1 - 20 32 21 -1 - 19 32 20 -1 - 18 32 19 -1 - 17 32 18 -1 - 16 32 17 -1 - 33 67 66 -1 - 67 33 34 -1 - 34 68 67 -1 - 68 34 35 -1 - 35 69 68 -1 - 69 35 36 -1 - 36 70 69 -1 - 70 36 37 -1 - 37 71 70 -1 - 71 37 38 -1 - 38 72 71 -1 - 72 38 39 -1 - 39 73 72 -1 - 73 39 40 -1 - 40 74 73 -1 - 74 40 41 -1 - 41 75 74 -1 - 75 41 42 -1 - 42 76 75 -1 - 76 42 43 -1 - 43 77 76 -1 - 77 43 44 -1 - 44 78 77 -1 - 78 44 45 -1 - 45 79 78 -1 - 79 45 46 -1 - 46 80 79 -1 - 80 46 47 -1 - 47 81 80 -1 - 81 47 48 -1 - 48 82 81 -1 - 82 48 49 -1 - 49 83 82 -1 - 83 49 50 -1 - 50 84 83 -1 - 84 50 51 -1 - 51 85 84 -1 - 85 51 52 -1 - 52 86 85 -1 - 86 52 53 -1 - 53 87 86 -1 - 87 53 54 -1 - 54 88 87 -1 - 88 54 55 -1 - 55 89 88 -1 - 89 55 56 -1 - 56 90 89 -1 - 90 56 57 -1 - 57 91 90 -1 - 91 57 58 -1 - 58 92 91 -1 - 92 58 59 -1 - 59 93 92 -1 - 93 59 60 -1 - 60 94 93 -1 - 94 60 61 -1 - 61 95 94 -1 - 95 61 62 -1 - 62 96 95 -1 - 96 62 63 -1 - 63 97 96 -1 - 97 63 64 -1 - 64 98 97 -1 - 98 64 65 -1 -'> - <Coordinate point=' -0 .05 -.8 -.16 .05 -.78 -.31 .05 -.74 -.44 .05 -.67 -.57 .05 -.57 -.67 .05 -.44 -.74 .05 -.31 -.78 .05 -.16 -.8 .05 0 -.78 .05 .16 -.74 .05 .31 -.67 .05 .44 -.57 .05 .57 -.44 .05 .67 -.31 .05 .74 -.16 .05 .78 --0 .05 .8 --.16 .05 .78 --.31 .05 .74 --.44 .05 .67 --.57 .05 .57 --.67 .05 .44 --.74 .05 .31 --.78 .05 .16 --.8 .05 -0 --.78 .05 -.16 --.74 .05 -.31 --.67 .05 -.44 --.57 .05 -.57 --.44 .05 -.67 --.31 .05 -.74 --.16 .05 -.78 -0 .05 0 -0 -.05 -.8 -.16 -.05 -.78 -.31 -.05 -.74 -.44 -.05 -.67 -.57 -.05 -.57 -.67 -.05 -.44 -.74 -.05 -.31 -.78 -.05 -.16 -.8 -.05 0 -.78 -.05 .16 -.74 -.05 .31 -.67 -.05 .44 -.57 -.05 .57 -.44 -.05 .67 -.31 -.05 .74 -.16 -.05 .78 --0 -.05 .8 --.16 -.05 .78 --.31 -.05 .74 --.44 -.05 .67 --.57 -.05 .57 --.67 -.05 .44 --.74 -.05 .31 --.78 -.05 .16 --.8 -.05 -0 --.78 -.05 -.16 --.74 -.05 -.31 --.67 -.05 -.44 --.57 -.05 -.57 --.44 -.05 -.67 --.31 -.05 -.74 --.16 -.05 -.78 -0 -.05 0 -'/> - <TextureCoordinate point=' -.5 1 -.598 .99 -.691 .962 -.778 .916 -.854 .854 -.916 .778 -.962 .691 -.99 .598 -1 .5 -.99 .402 -.962 .309 -.916 .222 -.854 .146 -.778 .084 -.691 .038 -.598 .01 -.5 0 -.402 .01 -.309 .038 -.222 .084 -.146 .146 -.084 .222 -.038 .309 -.01 .402 -0 .5 -.01 .598 -.038 .691 -.084 .778 -.146 .854 -.222 .916 -.309 .962 -.402 .99 -.5 .5 -1 1 -.969 1 -.938 1 -.906 1 -.875 1 -.844 1 -.813 1 -.781 1 -.75 1 -.719 1 -.688 1 -.656 1 -.625 1 -.594 1 -.563 1 -.531 1 -.5 1 -.469 1 -.438 1 -.406 1 -.375 1 -.344 1 -.313 1 -.281 1 -.25 1 -.219 1 -.188 1 -.156 1 -.125 1 -.094 1 -.063 1 -.031 1 -0 1 -1 0 -.969 0 -.938 0 -.906 0 -.875 0 -.844 0 -.813 0 -.781 0 -.75 0 -.719 0 -.688 0 -.656 0 -.625 0 -.594 0 -.563 0 -.531 0 -.5 0 -.469 0 -.438 0 -.406 0 -.375 0 -.344 0 -.313 0 -.281 0 -.25 0 -.219 0 -.188 0 -.156 0 -.125 0 -.094 0 -.063 0 -.031 0 -0 0 -'/> - </IndexedFaceSet> - </Shape> - </Transform> - <Transform DEF='dad_Group2' rotation='1 0 0 .251'> - <Group DEF='Group2'> - <Transform DEF='dad_Group1' rotation='0 1 0 3.142'> - <Group DEF='Group1'> - <Transform DEF='dad_DESRON31' rotation='1 0 0 1.571' translation='.01976 -.01317 -.1054'> - <Shape DEF='DESRON31'> - <Appearance> - <ImageTexture repeatS='false' repeatT='false' url='"newsealtest.jpg"'/> - <TextureTransform scale='.912 .981' translation='-.086 .009' center='-1.092 -.057'/> - <Material USE='Red_mat'/> - </Appearance> - <IndexedFaceSet creaseAngle='0.524' coordIndex=' - 0 32 1 -1 - 1 32 2 -1 - 2 32 3 -1 - 3 32 4 -1 - 4 32 5 -1 - 5 32 6 -1 - 6 32 7 -1 - 7 32 8 -1 - 8 32 9 -1 - 9 32 10 -1 - 10 32 11 -1 - 11 32 12 -1 - 12 32 13 -1 - 13 32 14 -1 - 14 32 15 -1 - 15 32 16 -1 - 16 32 17 -1 - 17 32 18 -1 - 18 32 19 -1 - 19 32 20 -1 - 20 32 21 -1 - 21 32 22 -1 - 22 32 23 -1 - 23 32 24 -1 - 24 32 25 -1 - 25 32 26 -1 - 26 32 27 -1 - 27 32 28 -1 - 28 32 29 -1 - 29 32 30 -1 - 30 32 31 -1 - 31 32 0 -1 - 34 65 33 -1 - 35 65 34 -1 - 36 65 35 -1 - 37 65 36 -1 - 38 65 37 -1 - 39 65 38 -1 - 40 65 39 -1 - 41 65 40 -1 - 42 65 41 -1 - 43 65 42 -1 - 44 65 43 -1 - 45 65 44 -1 - 46 65 45 -1 - 47 65 46 -1 - 48 65 47 -1 - 49 65 48 -1 - 50 65 49 -1 - 51 65 50 -1 - 52 65 51 -1 - 53 65 52 -1 - 54 65 53 -1 - 55 65 54 -1 - 56 65 55 -1 - 57 65 56 -1 - 58 65 57 -1 - 59 65 58 -1 - 60 65 59 -1 - 61 65 60 -1 - 62 65 61 -1 - 63 65 62 -1 - 64 65 63 -1 - 33 65 64 -1 - 0 34 33 -1 - 34 0 1 -1 - 1 35 34 -1 - 35 1 2 -1 - 2 36 35 -1 - 36 2 3 -1 - 3 37 36 -1 - 37 3 4 -1 - 4 38 37 -1 - 38 4 5 -1 - 5 39 38 -1 - 39 5 6 -1 - 6 40 39 -1 - 40 6 7 -1 - 7 41 40 -1 - 41 7 8 -1 - 8 42 41 -1 - 42 8 9 -1 - 9 43 42 -1 - 43 9 10 -1 - 10 44 43 -1 - 44 10 11 -1 - 11 45 44 -1 - 45 11 12 -1 - 12 46 45 -1 - 46 12 13 -1 - 13 47 46 -1 - 47 13 14 -1 - 14 48 47 -1 - 48 14 15 -1 - 15 49 48 -1 - 49 15 16 -1 - 16 50 49 -1 - 50 16 17 -1 - 17 51 50 -1 - 51 17 18 -1 - 18 52 51 -1 - 52 18 19 -1 - 19 53 52 -1 - 53 19 20 -1 - 20 54 53 -1 - 54 20 21 -1 - 21 55 54 -1 - 55 21 22 -1 - 22 56 55 -1 - 56 22 23 -1 - 23 57 56 -1 - 57 23 24 -1 - 24 58 57 -1 - 58 24 25 -1 - 25 59 58 -1 - 59 25 26 -1 - 26 60 59 -1 - 60 26 27 -1 - 27 61 60 -1 - 61 27 28 -1 - 28 62 61 -1 - 62 28 29 -1 - 29 63 62 -1 - 63 29 30 -1 - 30 64 63 -1 - 64 30 31 -1 - 31 33 64 -1 - 33 31 0 -1 -' texCoordIndex=' - 0 32 1 -1 - 1 32 2 -1 - 2 32 3 -1 - 3 32 4 -1 - 4 32 5 -1 - 5 32 6 -1 - 6 32 7 -1 - 7 32 8 -1 - 8 32 9 -1 - 9 32 10 -1 - 10 32 11 -1 - 11 32 12 -1 - 12 32 13 -1 - 13 32 14 -1 - 14 32 15 -1 - 15 32 16 -1 - 16 32 17 -1 - 17 32 18 -1 - 18 32 19 -1 - 19 32 20 -1 - 20 32 21 -1 - 21 32 22 -1 - 22 32 23 -1 - 23 32 24 -1 - 24 32 25 -1 - 25 32 26 -1 - 26 32 27 -1 - 27 32 28 -1 - 28 32 29 -1 - 29 32 30 -1 - 30 32 31 -1 - 31 32 0 -1 - 15 32 16 -1 - 14 32 15 -1 - 13 32 14 -1 - 12 32 13 -1 - 11 32 12 -1 - 10 32 11 -1 - 9 32 10 -1 - 8 32 9 -1 - 7 32 8 -1 - 6 32 7 -1 - 5 32 6 -1 - 4 32 5 -1 - 3 32 4 -1 - 2 32 3 -1 - 1 32 2 -1 - 0 32 1 -1 - 31 32 0 -1 - 30 32 31 -1 - 29 32 30 -1 - 28 32 29 -1 - 27 32 28 -1 - 26 32 27 -1 - 25 32 26 -1 - 24 32 25 -1 - 23 32 24 -1 - 22 32 23 -1 - 21 32 22 -1 - 20 32 21 -1 - 19 32 20 -1 - 18 32 19 -1 - 17 32 18 -1 - 16 32 17 -1 - 33 67 66 -1 - 67 33 34 -1 - 34 68 67 -1 - 68 34 35 -1 - 35 69 68 -1 - 69 35 36 -1 - 36 70 69 -1 - 70 36 37 -1 - 37 71 70 -1 - 71 37 38 -1 - 38 72 71 -1 - 72 38 39 -1 - 39 73 72 -1 - 73 39 40 -1 - 40 74 73 -1 - 74 40 41 -1 - 41 75 74 -1 - 75 41 42 -1 - 42 76 75 -1 - 76 42 43 -1 - 43 77 76 -1 - 77 43 44 -1 - 44 78 77 -1 - 78 44 45 -1 - 45 79 78 -1 - 79 45 46 -1 - 46 80 79 -1 - 80 46 47 -1 - 47 81 80 -1 - 81 47 48 -1 - 48 82 81 -1 - 82 48 49 -1 - 49 83 82 -1 - 83 49 50 -1 - 50 84 83 -1 - 84 50 51 -1 - 51 85 84 -1 - 85 51 52 -1 - 52 86 85 -1 - 86 52 53 -1 - 53 87 86 -1 - 87 53 54 -1 - 54 88 87 -1 - 88 54 55 -1 - 55 89 88 -1 - 89 55 56 -1 - 56 90 89 -1 - 90 56 57 -1 - 57 91 90 -1 - 91 57 58 -1 - 58 92 91 -1 - 92 58 59 -1 - 59 93 92 -1 - 93 59 60 -1 - 60 94 93 -1 - 94 60 61 -1 - 61 95 94 -1 - 95 61 62 -1 - 62 96 95 -1 - 96 62 63 -1 - 63 97 96 -1 - 97 63 64 -1 - 64 98 97 -1 - 98 64 65 -1 -'> - <Coordinate point=' -0 .05 -.8 -.16 .05 -.78 -.31 .05 -.74 -.44 .05 -.67 -.57 .05 -.57 -.67 .05 -.44 -.74 .05 -.31 -.78 .05 -.16 -.8 .05 0 -.78 .05 .16 -.74 .05 .31 -.67 .05 .44 -.57 .05 .57 -.44 .05 .67 -.31 .05 .74 -.16 .05 .78 --0 .05 .8 --.16 .05 .78 --.31 .05 .74 --.44 .05 .67 --.57 .05 .57 --.67 .05 .44 --.74 .05 .31 --.78 .05 .16 --.8 .05 -0 --.78 .05 -.16 --.74 .05 -.31 --.67 .05 -.44 --.57 .05 -.57 --.44 .05 -.67 --.31 .05 -.74 --.16 .05 -.78 -0 .05 0 -0 -.05 -.8 -.16 -.05 -.78 -.31 -.05 -.74 -.44 -.05 -.67 -.57 -.05 -.57 -.67 -.05 -.44 -.74 -.05 -.31 -.78 -.05 -.16 -.8 -.05 0 -.78 -.05 .16 -.74 -.05 .31 -.67 -.05 .44 -.57 -.05 .57 -.44 -.05 .67 -.31 -.05 .74 -.16 -.05 .78 --0 -.05 .8 --.16 -.05 .78 --.31 -.05 .74 --.44 -.05 .67 --.57 -.05 .57 --.67 -.05 .44 --.74 -.05 .31 --.78 -.05 .16 --.8 -.05 -0 --.78 -.05 -.16 --.74 -.05 -.31 --.67 -.05 -.44 --.57 -.05 -.57 --.44 -.05 -.67 --.31 -.05 -.74 --.16 -.05 -.78 -0 -.05 0 -'/> - <TextureCoordinate point=' -.5 1 -.598 .99 -.691 .962 -.778 .916 -.854 .854 -.916 .778 -.962 .691 -.99 .598 -1 .5 -.99 .402 -.962 .309 -.916 .222 -.854 .146 -.778 .084 -.691 .038 -.598 .01 -.5 0 -.402 .01 -.309 .038 -.222 .084 -.146 .146 -.084 .222 -.038 .309 -.01 .402 -0 .5 -.01 .598 -.038 .691 -.084 .778 -.146 .854 -.222 .916 -.309 .962 -.402 .99 -.5 .5 -1 1 -.969 1 -.938 1 -.906 1 -.875 1 -.844 1 -.813 1 -.781 1 -.75 1 -.719 1 -.688 1 -.656 1 -.625 1 -.594 1 -.563 1 -.531 1 -.5 1 -.469 1 -.438 1 -.406 1 -.375 1 -.344 1 -.313 1 -.281 1 -.25 1 -.219 1 -.188 1 -.156 1 -.125 1 -.094 1 -.063 1 -.031 1 -0 1 -1 0 -.969 0 -.938 0 -.906 0 -.875 0 -.844 0 -.813 0 -.781 0 -.75 0 -.719 0 -.688 0 -.656 0 -.625 0 -.594 0 -.563 0 -.531 0 -.5 0 -.469 0 -.438 0 -.406 0 -.375 0 -.344 0 -.313 0 -.281 0 -.25 0 -.219 0 -.188 0 -.156 0 -.125 0 -.094 0 -.063 0 -.031 0 -0 0 -'/> - </IndexedFaceSet> - </Shape> - </Transform> - </Group> - </Transform> - </Group> - </Transform> - </Group> - </Transform> - </Scene> -</X3D> diff --git a/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON9.x3d b/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON9.x3d new file mode 100644 index 0000000000000000000000000000000000000000..4d958bdb0fb3938b737c73f58ec163517b67a21a --- /dev/null +++ b/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON9.x3d @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "https://www.web3d.org/specifications/x3d-3.0.dtd"> +<X3D profile='Immersive' version='3.0' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='https://www.web3d.org/specifications/x3d-3.0.xsd'> + <head> + <meta content='COMDESRON9' name='title'/> + <meta content='Thumb_COMDESRON9_x3d14145131148866881.jpg' name='Vizthumbnail'/> + <meta content='../license.html' name='license'/> + </head> + <Scene> + <WorldInfo info='"This Web3D World was created with Vizx3D, a Web3D authoring tool" "www.vizx3d.com"' title='Vizx3D_1_2'/> + <Transform DEF='dad_GROUND'> + <Group DEF='GROUND'> + <Transform DEF='dad_DESRON9' rotation='1 0 0 1.571'> + <Shape DEF='DESRON9'> + <Appearance> + <ImageTexture repeatS='false' repeatT='false' url='"DESRON9.jpg"'/> + <TextureTransform center='-1.62 -1.389' scale='.947 .934' translation='-.073 -.044'/> + <Material DEF='Red_mat' diffuseColor='1 0 0'/> + </Appearance> + <IndexedFaceSet coordIndex='0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 34 65 33 -1 35 65 34 -1 36 65 35 -1 37 65 36 -1 38 65 37 -1 39 65 38 -1 40 65 39 -1 41 65 40 -1 42 65 41 -1 43 65 42 -1 44 65 43 -1 45 65 44 -1 46 65 45 -1 47 65 46 -1 48 65 47 -1 49 65 48 -1 50 65 49 -1 51 65 50 -1 52 65 51 -1 53 65 52 -1 54 65 53 -1 55 65 54 -1 56 65 55 -1 57 65 56 -1 58 65 57 -1 59 65 58 -1 60 65 59 -1 61 65 60 -1 62 65 61 -1 63 65 62 -1 64 65 63 -1 33 65 64 -1 0 34 33 -1 34 0 1 -1 1 35 34 -1 35 1 2 -1 2 36 35 -1 36 2 3 -1 3 37 36 -1 37 3 4 -1 4 38 37 -1 38 4 5 -1 5 39 38 -1 39 5 6 -1 6 40 39 -1 40 6 7 -1 7 41 40 -1 41 7 8 -1 8 42 41 -1 42 8 9 -1 9 43 42 -1 43 9 10 -1 10 44 43 -1 44 10 11 -1 11 45 44 -1 45 11 12 -1 12 46 45 -1 46 12 13 -1 13 47 46 -1 47 13 14 -1 14 48 47 -1 48 14 15 -1 15 49 48 -1 49 15 16 -1 16 50 49 -1 50 16 17 -1 17 51 50 -1 51 17 18 -1 18 52 51 -1 52 18 19 -1 19 53 52 -1 53 19 20 -1 20 54 53 -1 54 20 21 -1 21 55 54 -1 55 21 22 -1 22 56 55 -1 56 22 23 -1 23 57 56 -1 57 23 24 -1 24 58 57 -1 58 24 25 -1 25 59 58 -1 59 25 26 -1 26 60 59 -1 60 26 27 -1 27 61 60 -1 61 27 28 -1 28 62 61 -1 62 28 29 -1 29 63 62 -1 63 29 30 -1 30 64 63 -1 64 30 31 -1 31 33 64 -1 33 31 0 -1' creaseAngle='0.524' texCoordIndex='0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 15 32 16 -1 14 32 15 -1 13 32 14 -1 12 32 13 -1 11 32 12 -1 10 32 11 -1 9 32 10 -1 8 32 9 -1 7 32 8 -1 6 32 7 -1 5 32 6 -1 4 32 5 -1 3 32 4 -1 2 32 3 -1 1 32 2 -1 0 32 1 -1 31 32 0 -1 30 32 31 -1 29 32 30 -1 28 32 29 -1 27 32 28 -1 26 32 27 -1 25 32 26 -1 24 32 25 -1 23 32 24 -1 22 32 23 -1 21 32 22 -1 20 32 21 -1 19 32 20 -1 18 32 19 -1 17 32 18 -1 16 32 17 -1 33 67 66 -1 67 33 34 -1 34 68 67 -1 68 34 35 -1 35 69 68 -1 69 35 36 -1 36 70 69 -1 70 36 37 -1 37 71 70 -1 71 37 38 -1 38 72 71 -1 72 38 39 -1 39 73 72 -1 73 39 40 -1 40 74 73 -1 74 40 41 -1 41 75 74 -1 75 41 42 -1 42 76 75 -1 76 42 43 -1 43 77 76 -1 77 43 44 -1 44 78 77 -1 78 44 45 -1 45 79 78 -1 79 45 46 -1 46 80 79 -1 80 46 47 -1 47 81 80 -1 81 47 48 -1 48 82 81 -1 82 48 49 -1 49 83 82 -1 83 49 50 -1 50 84 83 -1 84 50 51 -1 51 85 84 -1 85 51 52 -1 52 86 85 -1 86 52 53 -1 53 87 86 -1 87 53 54 -1 54 88 87 -1 88 54 55 -1 55 89 88 -1 89 55 56 -1 56 90 89 -1 90 56 57 -1 57 91 90 -1 91 57 58 -1 58 92 91 -1 92 58 59 -1 59 93 92 -1 93 59 60 -1 60 94 93 -1 94 60 61 -1 61 95 94 -1 95 61 62 -1 62 96 95 -1 96 62 63 -1 63 97 96 -1 97 63 64 -1 64 98 97 -1 98 64 65 -1'> + <Coordinate point='0 .05 -.8 .16 .05 -.78 .31 .05 -.74 .44 .05 -.67 .57 .05 -.57 .67 .05 -.44 .74 .05 -.31 .78 .05 -.16 .8 .05 0 .78 .05 .16 .74 .05 .31 .67 .05 .44 .57 .05 .57 .44 .05 .67 .31 .05 .74 .16 .05 .78 -0 .05 .8 -.16 .05 .78 -.31 .05 .74 -.44 .05 .67 -.57 .05 .57 -.67 .05 .44 -.74 .05 .31 -.78 .05 .16 -.8 .05 -0 -.78 .05 -.16 -.74 .05 -.31 -.67 .05 -.44 -.57 .05 -.57 -.44 .05 -.67 -.31 .05 -.74 -.16 .05 -.78 0 .05 0 0 -.05 -.8 .16 -.05 -.78 .31 -.05 -.74 .44 -.05 -.67 .57 -.05 -.57 .67 -.05 -.44 .74 -.05 -.31 .78 -.05 -.16 .8 -.05 0 .78 -.05 .16 .74 -.05 .31 .67 -.05 .44 .57 -.05 .57 .44 -.05 .67 .31 -.05 .74 .16 -.05 .78 -0 -.05 .8 -.16 -.05 .78 -.31 -.05 .74 -.44 -.05 .67 -.57 -.05 .57 -.67 -.05 .44 -.74 -.05 .31 -.78 -.05 .16 -.8 -.05 -0 -.78 -.05 -.16 -.74 -.05 -.31 -.67 -.05 -.44 -.57 -.05 -.57 -.44 -.05 -.67 -.31 -.05 -.74 -.16 -.05 -.78 0 -.05 0'/> + <TextureCoordinate point='.5 1 .598 .99 .691 .962 .778 .916 .854 .854 .916 .778 .962 .691 .99 .598 1 .5 .99 .402 .962 .309 .916 .222 .854 .146 .778 .084 .691 .038 .598 .01 .5 0 .402 .01 .309 .038 .222 .084 .146 .146 .084 .222 .038 .309 .01 .402 0 .5 .01 .598 .038 .691 .084 .778 .146 .854 .222 .916 .309 .962 .402 .99 .5 .5 1 1 .969 1 .938 1 .906 1 .875 1 .844 1 .813 1 .781 1 .75 1 .719 1 .688 1 .656 1 .625 1 .594 1 .563 1 .531 1 .5 1 .469 1 .438 1 .406 1 .375 1 .344 1 .313 1 .281 1 .25 1 .219 1 .188 1 .156 1 .125 1 .094 1 .063 1 .031 1 0 1 1 0 .969 0 .938 0 .906 0 .875 0 .844 0 .813 0 .781 0 .75 0 .719 0 .688 0 .656 0 .625 0 .594 0 .563 0 .531 0 .5 0 .469 0 .438 0 .406 0 .375 0 .344 0 .313 0 .281 0 .25 0 .219 0 .188 0 .156 0 .125 0 .094 0 .063 0 .031 0 0 0'/> + </IndexedFaceSet> + </Shape> + </Transform> + </Group> + </Transform> + </Scene> +</X3D> \ No newline at end of file diff --git a/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON9/COMDESRON9.x3d b/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON9/COMDESRON9.x3d deleted file mode 100644 index d32d7e553f822acc8e2b5d64ebb6d20041852389..0000000000000000000000000000000000000000 --- a/ModelDetailing/MilitaryCrestsAndSeals/COMDESRON9/COMDESRON9.x3d +++ /dev/null @@ -1,453 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "https://www.web3d.org/specifications/x3d-3.0.dtd"> -<X3D profile='Immersive' version='3.0'> - <head> - <meta name='Vizthumbnail' key='Thumb_COMDESRON9_x3d14145131148866881.jpg'/> - </head> - <Scene> - <WorldInfo title='Vizx3D_1_2' info='"This Web3D World was created with Vizx3D, a Web3D authoring tool" -"www.vizx3d.com"'/> - <Transform DEF='dad_GROUND'> - <Group DEF='GROUND'> - <Transform DEF='dad_DESRON9' rotation='1 0 0 1.571'> - <Shape DEF='DESRON9'> - <Appearance> - <ImageTexture repeatS='false' repeatT='false' url='"DESRON9.jpg"'/> - <TextureTransform scale='.947 .934' translation='-.073 -.044' center='-1.62 -1.389'/> - <Material DEF='Red_mat' diffuseColor='1 0 0' shininess='0.2'/> - </Appearance> - <IndexedFaceSet creaseAngle='0.524' coordIndex=' - 0 32 1 -1 - 1 32 2 -1 - 2 32 3 -1 - 3 32 4 -1 - 4 32 5 -1 - 5 32 6 -1 - 6 32 7 -1 - 7 32 8 -1 - 8 32 9 -1 - 9 32 10 -1 - 10 32 11 -1 - 11 32 12 -1 - 12 32 13 -1 - 13 32 14 -1 - 14 32 15 -1 - 15 32 16 -1 - 16 32 17 -1 - 17 32 18 -1 - 18 32 19 -1 - 19 32 20 -1 - 20 32 21 -1 - 21 32 22 -1 - 22 32 23 -1 - 23 32 24 -1 - 24 32 25 -1 - 25 32 26 -1 - 26 32 27 -1 - 27 32 28 -1 - 28 32 29 -1 - 29 32 30 -1 - 30 32 31 -1 - 31 32 0 -1 - 34 65 33 -1 - 35 65 34 -1 - 36 65 35 -1 - 37 65 36 -1 - 38 65 37 -1 - 39 65 38 -1 - 40 65 39 -1 - 41 65 40 -1 - 42 65 41 -1 - 43 65 42 -1 - 44 65 43 -1 - 45 65 44 -1 - 46 65 45 -1 - 47 65 46 -1 - 48 65 47 -1 - 49 65 48 -1 - 50 65 49 -1 - 51 65 50 -1 - 52 65 51 -1 - 53 65 52 -1 - 54 65 53 -1 - 55 65 54 -1 - 56 65 55 -1 - 57 65 56 -1 - 58 65 57 -1 - 59 65 58 -1 - 60 65 59 -1 - 61 65 60 -1 - 62 65 61 -1 - 63 65 62 -1 - 64 65 63 -1 - 33 65 64 -1 - 0 34 33 -1 - 34 0 1 -1 - 1 35 34 -1 - 35 1 2 -1 - 2 36 35 -1 - 36 2 3 -1 - 3 37 36 -1 - 37 3 4 -1 - 4 38 37 -1 - 38 4 5 -1 - 5 39 38 -1 - 39 5 6 -1 - 6 40 39 -1 - 40 6 7 -1 - 7 41 40 -1 - 41 7 8 -1 - 8 42 41 -1 - 42 8 9 -1 - 9 43 42 -1 - 43 9 10 -1 - 10 44 43 -1 - 44 10 11 -1 - 11 45 44 -1 - 45 11 12 -1 - 12 46 45 -1 - 46 12 13 -1 - 13 47 46 -1 - 47 13 14 -1 - 14 48 47 -1 - 48 14 15 -1 - 15 49 48 -1 - 49 15 16 -1 - 16 50 49 -1 - 50 16 17 -1 - 17 51 50 -1 - 51 17 18 -1 - 18 52 51 -1 - 52 18 19 -1 - 19 53 52 -1 - 53 19 20 -1 - 20 54 53 -1 - 54 20 21 -1 - 21 55 54 -1 - 55 21 22 -1 - 22 56 55 -1 - 56 22 23 -1 - 23 57 56 -1 - 57 23 24 -1 - 24 58 57 -1 - 58 24 25 -1 - 25 59 58 -1 - 59 25 26 -1 - 26 60 59 -1 - 60 26 27 -1 - 27 61 60 -1 - 61 27 28 -1 - 28 62 61 -1 - 62 28 29 -1 - 29 63 62 -1 - 63 29 30 -1 - 30 64 63 -1 - 64 30 31 -1 - 31 33 64 -1 - 33 31 0 -1 -' texCoordIndex=' - 0 32 1 -1 - 1 32 2 -1 - 2 32 3 -1 - 3 32 4 -1 - 4 32 5 -1 - 5 32 6 -1 - 6 32 7 -1 - 7 32 8 -1 - 8 32 9 -1 - 9 32 10 -1 - 10 32 11 -1 - 11 32 12 -1 - 12 32 13 -1 - 13 32 14 -1 - 14 32 15 -1 - 15 32 16 -1 - 16 32 17 -1 - 17 32 18 -1 - 18 32 19 -1 - 19 32 20 -1 - 20 32 21 -1 - 21 32 22 -1 - 22 32 23 -1 - 23 32 24 -1 - 24 32 25 -1 - 25 32 26 -1 - 26 32 27 -1 - 27 32 28 -1 - 28 32 29 -1 - 29 32 30 -1 - 30 32 31 -1 - 31 32 0 -1 - 15 32 16 -1 - 14 32 15 -1 - 13 32 14 -1 - 12 32 13 -1 - 11 32 12 -1 - 10 32 11 -1 - 9 32 10 -1 - 8 32 9 -1 - 7 32 8 -1 - 6 32 7 -1 - 5 32 6 -1 - 4 32 5 -1 - 3 32 4 -1 - 2 32 3 -1 - 1 32 2 -1 - 0 32 1 -1 - 31 32 0 -1 - 30 32 31 -1 - 29 32 30 -1 - 28 32 29 -1 - 27 32 28 -1 - 26 32 27 -1 - 25 32 26 -1 - 24 32 25 -1 - 23 32 24 -1 - 22 32 23 -1 - 21 32 22 -1 - 20 32 21 -1 - 19 32 20 -1 - 18 32 19 -1 - 17 32 18 -1 - 16 32 17 -1 - 33 67 66 -1 - 67 33 34 -1 - 34 68 67 -1 - 68 34 35 -1 - 35 69 68 -1 - 69 35 36 -1 - 36 70 69 -1 - 70 36 37 -1 - 37 71 70 -1 - 71 37 38 -1 - 38 72 71 -1 - 72 38 39 -1 - 39 73 72 -1 - 73 39 40 -1 - 40 74 73 -1 - 74 40 41 -1 - 41 75 74 -1 - 75 41 42 -1 - 42 76 75 -1 - 76 42 43 -1 - 43 77 76 -1 - 77 43 44 -1 - 44 78 77 -1 - 78 44 45 -1 - 45 79 78 -1 - 79 45 46 -1 - 46 80 79 -1 - 80 46 47 -1 - 47 81 80 -1 - 81 47 48 -1 - 48 82 81 -1 - 82 48 49 -1 - 49 83 82 -1 - 83 49 50 -1 - 50 84 83 -1 - 84 50 51 -1 - 51 85 84 -1 - 85 51 52 -1 - 52 86 85 -1 - 86 52 53 -1 - 53 87 86 -1 - 87 53 54 -1 - 54 88 87 -1 - 88 54 55 -1 - 55 89 88 -1 - 89 55 56 -1 - 56 90 89 -1 - 90 56 57 -1 - 57 91 90 -1 - 91 57 58 -1 - 58 92 91 -1 - 92 58 59 -1 - 59 93 92 -1 - 93 59 60 -1 - 60 94 93 -1 - 94 60 61 -1 - 61 95 94 -1 - 95 61 62 -1 - 62 96 95 -1 - 96 62 63 -1 - 63 97 96 -1 - 97 63 64 -1 - 64 98 97 -1 - 98 64 65 -1 -'> - <Coordinate point=' -0 .05 -.8 -.16 .05 -.78 -.31 .05 -.74 -.44 .05 -.67 -.57 .05 -.57 -.67 .05 -.44 -.74 .05 -.31 -.78 .05 -.16 -.8 .05 0 -.78 .05 .16 -.74 .05 .31 -.67 .05 .44 -.57 .05 .57 -.44 .05 .67 -.31 .05 .74 -.16 .05 .78 --0 .05 .8 --.16 .05 .78 --.31 .05 .74 --.44 .05 .67 --.57 .05 .57 --.67 .05 .44 --.74 .05 .31 --.78 .05 .16 --.8 .05 -0 --.78 .05 -.16 --.74 .05 -.31 --.67 .05 -.44 --.57 .05 -.57 --.44 .05 -.67 --.31 .05 -.74 --.16 .05 -.78 -0 .05 0 -0 -.05 -.8 -.16 -.05 -.78 -.31 -.05 -.74 -.44 -.05 -.67 -.57 -.05 -.57 -.67 -.05 -.44 -.74 -.05 -.31 -.78 -.05 -.16 -.8 -.05 0 -.78 -.05 .16 -.74 -.05 .31 -.67 -.05 .44 -.57 -.05 .57 -.44 -.05 .67 -.31 -.05 .74 -.16 -.05 .78 --0 -.05 .8 --.16 -.05 .78 --.31 -.05 .74 --.44 -.05 .67 --.57 -.05 .57 --.67 -.05 .44 --.74 -.05 .31 --.78 -.05 .16 --.8 -.05 -0 --.78 -.05 -.16 --.74 -.05 -.31 --.67 -.05 -.44 --.57 -.05 -.57 --.44 -.05 -.67 --.31 -.05 -.74 --.16 -.05 -.78 -0 -.05 0 -'/> - <TextureCoordinate point=' -.5 1 -.598 .99 -.691 .962 -.778 .916 -.854 .854 -.916 .778 -.962 .691 -.99 .598 -1 .5 -.99 .402 -.962 .309 -.916 .222 -.854 .146 -.778 .084 -.691 .038 -.598 .01 -.5 0 -.402 .01 -.309 .038 -.222 .084 -.146 .146 -.084 .222 -.038 .309 -.01 .402 -0 .5 -.01 .598 -.038 .691 -.084 .778 -.146 .854 -.222 .916 -.309 .962 -.402 .99 -.5 .5 -1 1 -.969 1 -.938 1 -.906 1 -.875 1 -.844 1 -.813 1 -.781 1 -.75 1 -.719 1 -.688 1 -.656 1 -.625 1 -.594 1 -.563 1 -.531 1 -.5 1 -.469 1 -.438 1 -.406 1 -.375 1 -.344 1 -.313 1 -.281 1 -.25 1 -.219 1 -.188 1 -.156 1 -.125 1 -.094 1 -.063 1 -.031 1 -0 1 -1 0 -.969 0 -.938 0 -.906 0 -.875 0 -.844 0 -.813 0 -.781 0 -.75 0 -.719 0 -.688 0 -.656 0 -.625 0 -.594 0 -.563 0 -.531 0 -.5 0 -.469 0 -.438 0 -.406 0 -.375 0 -.344 0 -.313 0 -.281 0 -.25 0 -.219 0 -.188 0 -.156 0 -.125 0 -.094 0 -.063 0 -.031 0 -0 0 -'/> - </IndexedFaceSet> - </Shape> - </Transform> - </Group> - </Transform> - </Scene> -</X3D> diff --git a/ModelDetailing/MilitaryCrestsAndSeals/CSG11/CSG11.x3d b/ModelDetailing/MilitaryCrestsAndSeals/CSG11/CSG11.x3d index 6d0d237b69620f8323d44560f1f97f5918e9a537..7179f4d3d8a74838628d2d026c52eae45721213c 100644 --- a/ModelDetailing/MilitaryCrestsAndSeals/CSG11/CSG11.x3d +++ b/ModelDetailing/MilitaryCrestsAndSeals/CSG11/CSG11.x3d @@ -2,7 +2,7 @@ <!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "https://www.web3d.org/specifications/x3d-3.0.dtd"> <X3D profile='Immersive' version='3.0'> <head> - <meta name='Vizthumbnail' key='Thumb_CSG11_x3d14978421148866965.jpg'/> + <meta name='Vizthumbnail' key='Thumb_CSG11_x3d14978421148866965.jpg'/> </head> <Scene> <WorldInfo title='Vizx3D_1_2' info='"This Web3D World was created with Vizx3D, a Web3D authoring tool" diff --git a/ModelDetailing/MilitaryCrestsAndSeals/DESRON31Test.x3d b/ModelDetailing/MilitaryCrestsAndSeals/DESRON31Test.x3d new file mode 100644 index 0000000000000000000000000000000000000000..6fec98738f486f67507e04356eb2feb0e76c27af --- /dev/null +++ b/ModelDetailing/MilitaryCrestsAndSeals/DESRON31Test.x3d @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "https://www.web3d.org/specifications/x3d-3.0.dtd"> +<X3D profile='Immersive' version='3.0' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='https://www.web3d.org/specifications/x3d-3.0.xsd'> + <head> + <meta content='DESRON31Test' name='title'/> + <meta content='Thumb_DESRON31Test_x3d47572691148873503.jpg' name='Vizthumbnail'/> + <meta content='../license.html' name='license'/> + </head> + <Scene> + <WorldInfo info='"This Web3D World was created with Vizx3D, a Web3D authoring tool" "www.vizx3d.com"' title='DESRON31Starboard'/> + <Transform DEF='dad_GROUND'> + <Group DEF='GROUND'> + <Transform DEF='dad_DESRON32' rotation='-1 0 0 1.571' translation='-2.78641 -.50063 0'> + <Shape DEF='DESRON32'> + <Appearance> + <ImageTexture repeatS='false' repeatT='false' url='"newsealtest.jpg"'/> + <TextureTransform center='-1.092 -.057' scale='.912 .981' translation='-.086 .009'/> + <Material DEF='Red_mat' diffuseColor='1 0 0'/> + </Appearance> + <IndexedFaceSet coordIndex='0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 34 65 33 -1 35 65 34 -1 36 65 35 -1 37 65 36 -1 38 65 37 -1 39 65 38 -1 40 65 39 -1 41 65 40 -1 42 65 41 -1 43 65 42 -1 44 65 43 -1 45 65 44 -1 46 65 45 -1 47 65 46 -1 48 65 47 -1 49 65 48 -1 50 65 49 -1 51 65 50 -1 52 65 51 -1 53 65 52 -1 54 65 53 -1 55 65 54 -1 56 65 55 -1 57 65 56 -1 58 65 57 -1 59 65 58 -1 60 65 59 -1 61 65 60 -1 62 65 61 -1 63 65 62 -1 64 65 63 -1 33 65 64 -1 0 34 33 -1 34 0 1 -1 1 35 34 -1 35 1 2 -1 2 36 35 -1 36 2 3 -1 3 37 36 -1 37 3 4 -1 4 38 37 -1 38 4 5 -1 5 39 38 -1 39 5 6 -1 6 40 39 -1 40 6 7 -1 7 41 40 -1 41 7 8 -1 8 42 41 -1 42 8 9 -1 9 43 42 -1 43 9 10 -1 10 44 43 -1 44 10 11 -1 11 45 44 -1 45 11 12 -1 12 46 45 -1 46 12 13 -1 13 47 46 -1 47 13 14 -1 14 48 47 -1 48 14 15 -1 15 49 48 -1 49 15 16 -1 16 50 49 -1 50 16 17 -1 17 51 50 -1 51 17 18 -1 18 52 51 -1 52 18 19 -1 19 53 52 -1 53 19 20 -1 20 54 53 -1 54 20 21 -1 21 55 54 -1 55 21 22 -1 22 56 55 -1 56 22 23 -1 23 57 56 -1 57 23 24 -1 24 58 57 -1 58 24 25 -1 25 59 58 -1 59 25 26 -1 26 60 59 -1 60 26 27 -1 27 61 60 -1 61 27 28 -1 28 62 61 -1 62 28 29 -1 29 63 62 -1 63 29 30 -1 30 64 63 -1 64 30 31 -1 31 33 64 -1 33 31 0 -1' creaseAngle='0.524' texCoordIndex='0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 15 32 16 -1 14 32 15 -1 13 32 14 -1 12 32 13 -1 11 32 12 -1 10 32 11 -1 9 32 10 -1 8 32 9 -1 7 32 8 -1 6 32 7 -1 5 32 6 -1 4 32 5 -1 3 32 4 -1 2 32 3 -1 1 32 2 -1 0 32 1 -1 31 32 0 -1 30 32 31 -1 29 32 30 -1 28 32 29 -1 27 32 28 -1 26 32 27 -1 25 32 26 -1 24 32 25 -1 23 32 24 -1 22 32 23 -1 21 32 22 -1 20 32 21 -1 19 32 20 -1 18 32 19 -1 17 32 18 -1 16 32 17 -1 33 67 66 -1 67 33 34 -1 34 68 67 -1 68 34 35 -1 35 69 68 -1 69 35 36 -1 36 70 69 -1 70 36 37 -1 37 71 70 -1 71 37 38 -1 38 72 71 -1 72 38 39 -1 39 73 72 -1 73 39 40 -1 40 74 73 -1 74 40 41 -1 41 75 74 -1 75 41 42 -1 42 76 75 -1 76 42 43 -1 43 77 76 -1 77 43 44 -1 44 78 77 -1 78 44 45 -1 45 79 78 -1 79 45 46 -1 46 80 79 -1 80 46 47 -1 47 81 80 -1 81 47 48 -1 48 82 81 -1 82 48 49 -1 49 83 82 -1 83 49 50 -1 50 84 83 -1 84 50 51 -1 51 85 84 -1 85 51 52 -1 52 86 85 -1 86 52 53 -1 53 87 86 -1 87 53 54 -1 54 88 87 -1 88 54 55 -1 55 89 88 -1 89 55 56 -1 56 90 89 -1 90 56 57 -1 57 91 90 -1 91 57 58 -1 58 92 91 -1 92 58 59 -1 59 93 92 -1 93 59 60 -1 60 94 93 -1 94 60 61 -1 61 95 94 -1 95 61 62 -1 62 96 95 -1 96 62 63 -1 63 97 96 -1 97 63 64 -1 64 98 97 -1 98 64 65 -1'> + <Coordinate point='0 .05 -.8 .16 .05 -.78 .31 .05 -.74 .44 .05 -.67 .57 .05 -.57 .67 .05 -.44 .74 .05 -.31 .78 .05 -.16 .8 .05 0 .78 .05 .16 .74 .05 .31 .67 .05 .44 .57 .05 .57 .44 .05 .67 .31 .05 .74 .16 .05 .78 -0 .05 .8 -.16 .05 .78 -.31 .05 .74 -.44 .05 .67 -.57 .05 .57 -.67 .05 .44 -.74 .05 .31 -.78 .05 .16 -.8 .05 -0 -.78 .05 -.16 -.74 .05 -.31 -.67 .05 -.44 -.57 .05 -.57 -.44 .05 -.67 -.31 .05 -.74 -.16 .05 -.78 0 .05 0 0 -.05 -.8 .16 -.05 -.78 .31 -.05 -.74 .44 -.05 -.67 .57 -.05 -.57 .67 -.05 -.44 .74 -.05 -.31 .78 -.05 -.16 .8 -.05 0 .78 -.05 .16 .74 -.05 .31 .67 -.05 .44 .57 -.05 .57 .44 -.05 .67 .31 -.05 .74 .16 -.05 .78 -0 -.05 .8 -.16 -.05 .78 -.31 -.05 .74 -.44 -.05 .67 -.57 -.05 .57 -.67 -.05 .44 -.74 -.05 .31 -.78 -.05 .16 -.8 -.05 -0 -.78 -.05 -.16 -.74 -.05 -.31 -.67 -.05 -.44 -.57 -.05 -.57 -.44 -.05 -.67 -.31 -.05 -.74 -.16 -.05 -.78 0 -.05 0'/> + <TextureCoordinate point='.5 1 .598 .99 .691 .962 .778 .916 .854 .854 .916 .778 .962 .691 .99 .598 1 .5 .99 .402 .962 .309 .916 .222 .854 .146 .778 .084 .691 .038 .598 .01 .5 0 .402 .01 .309 .038 .222 .084 .146 .146 .084 .222 .038 .309 .01 .402 0 .5 .01 .598 .038 .691 .084 .778 .146 .854 .222 .916 .309 .962 .402 .99 .5 .5 1 1 .969 1 .938 1 .906 1 .875 1 .844 1 .813 1 .781 1 .75 1 .719 1 .688 1 .656 1 .625 1 .594 1 .563 1 .531 1 .5 1 .469 1 .438 1 .406 1 .375 1 .344 1 .313 1 .281 1 .25 1 .219 1 .188 1 .156 1 .125 1 .094 1 .063 1 .031 1 0 1 1 0 .969 0 .938 0 .906 0 .875 0 .844 0 .813 0 .781 0 .75 0 .719 0 .688 0 .656 0 .625 0 .594 0 .563 0 .531 0 .5 0 .469 0 .438 0 .406 0 .375 0 .344 0 .313 0 .281 0 .25 0 .219 0 .188 0 .156 0 .125 0 .094 0 .063 0 .031 0 0 0'/> + </IndexedFaceSet> + </Shape> + </Transform> + <Transform DEF='dad_Group2' rotation='1 0 0 .251'> + <Group DEF='Group2'> + <Transform DEF='dad_Group1' rotation='0 1 0 3.142'> + <Group DEF='Group1'> + <Transform DEF='dad_DESRON31' rotation='1 0 0 1.571' translation='.01976 -.01317 -.1054'> + <Shape DEF='DESRON31'> + <Appearance> + <ImageTexture repeatS='false' repeatT='false' url='"newsealtest.jpg"'/> + <TextureTransform center='-1.092 -.057' scale='.912 .981' translation='-.086 .009'/> + <Material USE='Red_mat'/> + </Appearance> + <IndexedFaceSet coordIndex='0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 34 65 33 -1 35 65 34 -1 36 65 35 -1 37 65 36 -1 38 65 37 -1 39 65 38 -1 40 65 39 -1 41 65 40 -1 42 65 41 -1 43 65 42 -1 44 65 43 -1 45 65 44 -1 46 65 45 -1 47 65 46 -1 48 65 47 -1 49 65 48 -1 50 65 49 -1 51 65 50 -1 52 65 51 -1 53 65 52 -1 54 65 53 -1 55 65 54 -1 56 65 55 -1 57 65 56 -1 58 65 57 -1 59 65 58 -1 60 65 59 -1 61 65 60 -1 62 65 61 -1 63 65 62 -1 64 65 63 -1 33 65 64 -1 0 34 33 -1 34 0 1 -1 1 35 34 -1 35 1 2 -1 2 36 35 -1 36 2 3 -1 3 37 36 -1 37 3 4 -1 4 38 37 -1 38 4 5 -1 5 39 38 -1 39 5 6 -1 6 40 39 -1 40 6 7 -1 7 41 40 -1 41 7 8 -1 8 42 41 -1 42 8 9 -1 9 43 42 -1 43 9 10 -1 10 44 43 -1 44 10 11 -1 11 45 44 -1 45 11 12 -1 12 46 45 -1 46 12 13 -1 13 47 46 -1 47 13 14 -1 14 48 47 -1 48 14 15 -1 15 49 48 -1 49 15 16 -1 16 50 49 -1 50 16 17 -1 17 51 50 -1 51 17 18 -1 18 52 51 -1 52 18 19 -1 19 53 52 -1 53 19 20 -1 20 54 53 -1 54 20 21 -1 21 55 54 -1 55 21 22 -1 22 56 55 -1 56 22 23 -1 23 57 56 -1 57 23 24 -1 24 58 57 -1 58 24 25 -1 25 59 58 -1 59 25 26 -1 26 60 59 -1 60 26 27 -1 27 61 60 -1 61 27 28 -1 28 62 61 -1 62 28 29 -1 29 63 62 -1 63 29 30 -1 30 64 63 -1 64 30 31 -1 31 33 64 -1 33 31 0 -1' creaseAngle='0.524' texCoordIndex='0 32 1 -1 1 32 2 -1 2 32 3 -1 3 32 4 -1 4 32 5 -1 5 32 6 -1 6 32 7 -1 7 32 8 -1 8 32 9 -1 9 32 10 -1 10 32 11 -1 11 32 12 -1 12 32 13 -1 13 32 14 -1 14 32 15 -1 15 32 16 -1 16 32 17 -1 17 32 18 -1 18 32 19 -1 19 32 20 -1 20 32 21 -1 21 32 22 -1 22 32 23 -1 23 32 24 -1 24 32 25 -1 25 32 26 -1 26 32 27 -1 27 32 28 -1 28 32 29 -1 29 32 30 -1 30 32 31 -1 31 32 0 -1 15 32 16 -1 14 32 15 -1 13 32 14 -1 12 32 13 -1 11 32 12 -1 10 32 11 -1 9 32 10 -1 8 32 9 -1 7 32 8 -1 6 32 7 -1 5 32 6 -1 4 32 5 -1 3 32 4 -1 2 32 3 -1 1 32 2 -1 0 32 1 -1 31 32 0 -1 30 32 31 -1 29 32 30 -1 28 32 29 -1 27 32 28 -1 26 32 27 -1 25 32 26 -1 24 32 25 -1 23 32 24 -1 22 32 23 -1 21 32 22 -1 20 32 21 -1 19 32 20 -1 18 32 19 -1 17 32 18 -1 16 32 17 -1 33 67 66 -1 67 33 34 -1 34 68 67 -1 68 34 35 -1 35 69 68 -1 69 35 36 -1 36 70 69 -1 70 36 37 -1 37 71 70 -1 71 37 38 -1 38 72 71 -1 72 38 39 -1 39 73 72 -1 73 39 40 -1 40 74 73 -1 74 40 41 -1 41 75 74 -1 75 41 42 -1 42 76 75 -1 76 42 43 -1 43 77 76 -1 77 43 44 -1 44 78 77 -1 78 44 45 -1 45 79 78 -1 79 45 46 -1 46 80 79 -1 80 46 47 -1 47 81 80 -1 81 47 48 -1 48 82 81 -1 82 48 49 -1 49 83 82 -1 83 49 50 -1 50 84 83 -1 84 50 51 -1 51 85 84 -1 85 51 52 -1 52 86 85 -1 86 52 53 -1 53 87 86 -1 87 53 54 -1 54 88 87 -1 88 54 55 -1 55 89 88 -1 89 55 56 -1 56 90 89 -1 90 56 57 -1 57 91 90 -1 91 57 58 -1 58 92 91 -1 92 58 59 -1 59 93 92 -1 93 59 60 -1 60 94 93 -1 94 60 61 -1 61 95 94 -1 95 61 62 -1 62 96 95 -1 96 62 63 -1 63 97 96 -1 97 63 64 -1 64 98 97 -1 98 64 65 -1'> + <Coordinate point='0 .05 -.8 .16 .05 -.78 .31 .05 -.74 .44 .05 -.67 .57 .05 -.57 .67 .05 -.44 .74 .05 -.31 .78 .05 -.16 .8 .05 0 .78 .05 .16 .74 .05 .31 .67 .05 .44 .57 .05 .57 .44 .05 .67 .31 .05 .74 .16 .05 .78 -0 .05 .8 -.16 .05 .78 -.31 .05 .74 -.44 .05 .67 -.57 .05 .57 -.67 .05 .44 -.74 .05 .31 -.78 .05 .16 -.8 .05 -0 -.78 .05 -.16 -.74 .05 -.31 -.67 .05 -.44 -.57 .05 -.57 -.44 .05 -.67 -.31 .05 -.74 -.16 .05 -.78 0 .05 0 0 -.05 -.8 .16 -.05 -.78 .31 -.05 -.74 .44 -.05 -.67 .57 -.05 -.57 .67 -.05 -.44 .74 -.05 -.31 .78 -.05 -.16 .8 -.05 0 .78 -.05 .16 .74 -.05 .31 .67 -.05 .44 .57 -.05 .57 .44 -.05 .67 .31 -.05 .74 .16 -.05 .78 -0 -.05 .8 -.16 -.05 .78 -.31 -.05 .74 -.44 -.05 .67 -.57 -.05 .57 -.67 -.05 .44 -.74 -.05 .31 -.78 -.05 .16 -.8 -.05 -0 -.78 -.05 -.16 -.74 -.05 -.31 -.67 -.05 -.44 -.57 -.05 -.57 -.44 -.05 -.67 -.31 -.05 -.74 -.16 -.05 -.78 0 -.05 0'/> + <TextureCoordinate point='.5 1 .598 .99 .691 .962 .778 .916 .854 .854 .916 .778 .962 .691 .99 .598 1 .5 .99 .402 .962 .309 .916 .222 .854 .146 .778 .084 .691 .038 .598 .01 .5 0 .402 .01 .309 .038 .222 .084 .146 .146 .084 .222 .038 .309 .01 .402 0 .5 .01 .598 .038 .691 .084 .778 .146 .854 .222 .916 .309 .962 .402 .99 .5 .5 1 1 .969 1 .938 1 .906 1 .875 1 .844 1 .813 1 .781 1 .75 1 .719 1 .688 1 .656 1 .625 1 .594 1 .563 1 .531 1 .5 1 .469 1 .438 1 .406 1 .375 1 .344 1 .313 1 .281 1 .25 1 .219 1 .188 1 .156 1 .125 1 .094 1 .063 1 .031 1 0 1 1 0 .969 0 .938 0 .906 0 .875 0 .844 0 .813 0 .781 0 .75 0 .719 0 .688 0 .656 0 .625 0 .594 0 .563 0 .531 0 .5 0 .469 0 .438 0 .406 0 .375 0 .344 0 .313 0 .281 0 .25 0 .219 0 .188 0 .156 0 .125 0 .094 0 .063 0 .031 0 0 0'/> + </IndexedFaceSet> + </Shape> + </Transform> + </Group> + </Transform> + </Group> + </Transform> + </Group> + </Transform> + </Scene> +</X3D> \ No newline at end of file diff --git a/build.xml b/build.xml index 131026cc6ba7ccddfd0aa565749f95b2d6833077..03e3bf672513f9dfc7271cfff897d5383bf0cc58 100644 --- a/build.xml +++ b/build.xml @@ -294,8 +294,9 @@ POSSIBILITY OF SUCH DAMAGE. <property name="CreateContentCatalog.dir" location="../../../tools/CreateContentCatalog"/> <property name="X3dDtdsSchemas.dir" location="../../../../specifications"/> <property name="resolver.dir" location="${env.ANT_HOME}/lib"/> - <!-- https:///xerces.apache.org/mirrors.cgi XML Commons Resolver Version 1.2 - zip --> - <length property="resolver.jar.length" file="${resolver.dir}/resolver.jar"/> + <property name="resolver.jar" value="xml-resolver-1.2.jar"/> + <length property="resolver.jar.length" file="${resolver.dir}/${resolver.jar}"/> + <!-- original alternative to ant: https:///xerces.apache.org/mirrors.cgi XML Commons Resolver Version 1.2 - zip --> <!-- OASIS XML Catalog standard references @@ -310,7 +311,7 @@ Apache Ant validation and resolver references https:///xerces.apache.org/xerces-j/features.html https:///xerces.apache.org/xerces-j/properties.html Key references: - https:///xml.apache.org/commons/components/resolver (then see resolver.jar) + https:///xml.apache.org/commons/components/resolver (then see ${resolver.jar}) https:///xerces.apache.org/xml-commons https:///www.apache.org/dist/xerces/xml-commons --> @@ -332,7 +333,7 @@ Key references: <!-- Transitional DTD, versions 3.0 and 3.1 only --> <dtd publicId="file:///www.web3d.org/TaskGroups/x3d/translation/x3d-3.0.dtd" location="${X3dDtdsSchemas.dir}/x3d-3.0.dtd"/> <dtd publicId="file:///www.web3d.org/TaskGroups/x3d/translation/x3d-3.1.dtd" location="${X3dDtdsSchemas.dir}/x3d-3.1.dtd"/> - <!-- fallback solution, depends on resolver.jar availability --> + <!-- fallback solution, depends on ${resolver.jar} availability --> <xmlcatalog> <catalogpath location="${X3dDtdsSchemas.dir}/${xml.catalog.file}" description="external path to same definitions"/> </xmlcatalog> @@ -359,7 +360,7 @@ Key references: <echo message="... -expand:'@{expand}' parameterPair1='@{parameterPair1}' parameterPair2='@{parameterPair2}' parameterPair3='@{parameterPair3}'"/> --> <java classname="net.sf.saxon.Transform" - classpath="${saxon.dir}/${saxon.jar};${resolver.dir}/resolver.jar" + classpath="${saxon.dir}/${saxon.jar};${resolver.dir}/${resolver.jar}" fork="${fork}" failonerror="false"> <!-- TODO @@ -372,8 +373,8 @@ Key references: https://www.saxonica.com/html/documentation/sourcedocs/xml-catalogs.html "How to use a catalog file: Using catalogs with Saxon" https://www.sagehill.net/docbookxsl/UseCatalog.html - download resolver.jar from https://www.apache.org/dist/xerces/xml-commons (formerly https://xml.apache.org/commons/dist) - unzip package and install resolver.jar into classpath above, + download ${resolver.jar} from https://www.apache.org/dist/xerces/xml-commons (formerly https://xml.apache.org/commons/dist) + unzip package and install ${resolver.jar} into classpath above, must also have CatalogManager.properties in CLASSPATH <arg value="-r:org.apache.xml.resolver.tools.CatalogResolver"/> <arg value="-x:org.apache.xml.resolver.tools.ResolvingXMLReader"/> @@ -497,7 +498,7 @@ Key references: <target name="saxon.help" description="display command-line settings"> <java classname="net.sf.saxon.Transform" - classpath="${saxon.dir}/${saxon.jar};${resolver.dir}/resolver.jar" + classpath="${saxon.dir}/${saxon.jar};${resolver.dir}/${resolver.jar}" fork="${fork}" failonerror="false"> <arg value="-?"/> @@ -1362,7 +1363,7 @@ ignoreSetupDownloadErrors=true <echo message=" X3dDtdsSchemas.dir=${X3dDtdsSchemas.dir}"/> <echo message=" ignoreSetupDownloadErrors=${ignoreSetupDownloadErrors}"/> <echo message=" saxon path: ${saxon.dir}/${saxon.jar}"/> - <!-- TODO <echo message="resolver path: ${resolver.dir}/resolver.jar (${resolver.jar.length} bytes)"/> --> + <!-- TODO <echo message="resolver path: ${resolver.dir}/${resolver.jar} (${resolver.jar.length} bytes)"/> --> <!-- make library directories for supporting jar files --> <mkdir dir="jenkins/lib"/> @@ -1495,7 +1496,7 @@ ignoreSetupDownloadErrors=true </target> <target name="commonSetup" depends="HelloWorld,newScene" description="Copy setup files from common example archives"> - <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/resolver.jar (${resolver.jar.length} bytes)"/> + <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/${resolver.jar} (${resolver.jar.length} bytes)"/> <!-- each specific example archive redirects to X3dResources.html (formerly help.html) in parent examples directory due to other relative links there --> <get src="${x3d.sourceforge.site}/x3d/content/examples/_help.redirect.html?format=raw" dest="help.html" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/> @@ -1988,7 +1989,7 @@ ignoreSetupDownloadErrors=true depends="clean.duplicates"> <!-- XML well-formed checks --> <echo message="XML well-formed check: ${archive.name} build.xml and scenes"/> - <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/resolver.jar (${resolver.jar.length} bytes)"/> + <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/${resolver.jar} (${resolver.jar.length} bytes)"/> <xmlvalidate failonerror="false" warn="true" lenient="true" file="build.xml"/> <echo message="X3D DTDs and schemas available at https://www.web3d.org/specifications"/> <echo message="check well-formedness of X3D scenes"/> @@ -3356,7 +3357,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos <target name="processScenes.canonicalX3D" description="generate canonical X3D form" depends="clean.duplicates"> <!-- TODO: XMLUnit test comparing Filename.x3d to FilenameCanonical.xml --> - <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/resolver.jar (${resolver.jar.length} bytes)"/> + <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/${resolver.jar} (${resolver.jar.length} bytes)"/> <for param="file.path.name"> <path> <fileset refid="x3dScenes"/> @@ -3837,7 +3838,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos <target name="processScenes.X3dTidy" description="Apply X3dTidy.xslt to clean up X3D scene errors (when .x3d is more recent than .html)" depends="clean.X3dTidy,clean.duplicates"> <echo message="Apply X3dTidy.xslt to clean up X3D scene errors (when .x3d is more recent than .html)"/> - <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/resolver.jar (${resolver.jar.length} bytes)"/> + <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/${resolver.jar} (${resolver.jar.length} bytes)"/> <for param="file.path.name"> <path> <fileset refid="x3dScenes"/> @@ -4088,7 +4089,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos <target name="processScenes.X3DJSAIL.DomLoaderTests" description="test DOM-based scene loading by X3DJSAIL.X3DLoader" depends=""> <echo message="test DOM-based scene loading by X3DJSAIL.X3DLoader"/> - <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/resolver.jar (${resolver.jar.length} bytes)"/> + <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/${resolver.jar} (${resolver.jar.length} bytes)"/> <for param="file.path.name"> <path> <fileset refid="x3dScenes"/> @@ -4134,7 +4135,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos <target name="processScenes.java" description="generate java source, .class files, javadoc" depends="clean.RoundTrip"> <mkdir dir="${java.classes.dir}"/> - <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/resolver.jar (${resolver.jar.length} bytes)"/> + <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/${resolver.jar} (${resolver.jar.length} bytes)"/> <for param="file.path.name"> <path> <fileset refid="x3dScenes"/> @@ -4321,7 +4322,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos <echo message="$pyjnius.X3DautoclassPath =${pyjnius.X3DautoclassPath}"/> <echo message="$pyjnius.configurationPath=${pyjnius.configurationPath}"/> --> - <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/resolver.jar (${resolver.jar.length} bytes)"/> + <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/${resolver.jar} (${resolver.jar.length} bytes)"/> <echo message="====================="/> <for param="file.path.name"> <path> @@ -4413,7 +4414,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos </target> <target name="processScenes.turtle" description="generate turtle source, run validation test" depends=""> - <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/resolver.jar (${resolver.jar.length} bytes)"/> + <echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/${resolver.jar} (${resolver.jar.length} bytes)"/> <echo message="==================================="/> <for param="file.path.name"> <path> diff --git a/developers.html b/developers.html index 159b1ad7ad589803a3e48244c3e708b32e78e1ef..163a6a4d347dc39ef28cbca6748e254666d6c2fb 100644 --- a/developers.html +++ b/developers.html @@ -851,14 +851,14 @@ Note that the -d switch is necessary for domain users. which does not need to be installed separately. </li> <li> - OpenJDK <code style="color:darkgreen"><b>jdk-15.0.1</b></code> + OpenJDK <code style="color:darkgreen"><b>jdk-15.0.2</b></code> is default Java version for Savage projects, used under a <a href="https://openjdk.java.net/legal/gplv2+ce.html" target="_blank">non-viral open-source license</a>. </li> <li> Oracle - <code style="color:darkgreen"><b>jdk-15.0.1</b></code> + <code style="color:darkgreen"><b>jdk-15.0.2</b></code> and <code style="color:darkgreen"><b>jdk1.8.0_221</b></code> are alternative Java versions used in current development. @@ -876,7 +876,7 @@ Note that the -d switch is necessary for domain users. or --> <br /> - <code style="color:darkgreen"><b>JAVA_HOME=C:\Program Files\Java\openjdk\jdk-15.0.1</b></code> + <code style="color:darkgreen"><b>JAVA_HOME=C:\Program Files\Java\openjdk\jdk-15.0.2</b></code> <br /> <code style="color:darkgreen"><b>JAVA_HOME=C:\Program Files\Java\jdk-14</b></code> <br /> @@ -892,9 +892,9 @@ Note that the -d switch is necessary for domain users. <pre> $<b> java -version</b> # OpenJDK 15 -openjdk 15.0.1 2020-10-20 -OpenJDK Runtime Environment (build 15.0.1+9-18) -OpenJDK 64-Bit Server VM (build 15.0.1+9-18, mixed mode, sharing) +openjdk version "15.0.2" 2021-01-19 +OpenJDK Runtime Environment (build 15.0.2+7-27) +OpenJDK 64-Bit Server VM (build 15.0.2+7-27, mixed mode, sharing) </pre> </li> <li> @@ -908,8 +908,15 @@ Java HotSpot(TM) 64-Bit Server VM (build 25.221-b11, mixed mode) </li> </ul> </li> + <li> + Javadoc downloads for local use are available on the + <a href="https://www.oracle.com/java/technologies/javase-downloads.html" target="_blank">Java SE downloads</a> page. + Extract the <code style="color:darkgreen"><b>docs</b></code> directory tree provided by the .zip + into the directory containing the corresponding version of Java. + </li> <li> Summaries of Java language feature improvements: + <a href="https://openjdk.java.net/projects/jdk/15" target="_blank">JDK 15</a>, <a href="https://openjdk.java.net/projects/jdk/14" target="_blank">JDK 14</a>, <a href="https://openjdk.java.net/projects/jdk/13" target="_blank">JDK 13</a>, <a href="https://openjdk.java.net/projects/jdk/12" target="_blank">JDK 12</a>, @@ -918,22 +925,16 @@ Java HotSpot(TM) 64-Bit Server VM (build 25.221-b11, mixed mode) <a href="https://openjdk.java.net/projects/jdk9" target="_blank">JDK 9</a>. </li> <li> - <a href="https://docs.oracle.com/en/java/javase/14" target="_blank">Java 14 Documentation</a> + <a href="https://docs.oracle.com/en/java/javase/15" target="_blank">JDK 15 Javadoc Documentation</a> is useful. <a href="https://docs.oracle.com/javase/8/docs/api" target="_blank">Java 8 Javadoc</a> is also online. </li> - <li> - Javadoc downloads for local use are available on the - <a href="https://www.oracle.com/technetwork/java/javase/downloads/index.html" target="_blank">Java downloads</a> page. - Extract the <code style="color:darkgreen"><b>docs</b></code> directory tree provided by the .zip - into the directory containing the corresponding version of Java. - </li> <ul> <li> - (Note that - <a href="https://www.oracle.com/java/technologies/javase-jdk14-doc-downloads.html" target="_blank">OpenJDK Java 14 Javadoc</a> - directs to the same javadoc as Oracle Javadoc.) + (Note that OpenJDK Java 15 Javadoc + <!-- <a href="https://www.oracle.com/java/technologies/javase-jdk14-doc-downloads.html" target="_blank">OpenJDK Java 15 Javadoc</a> --> + uses the same javadoc as Oracle Javadoc.) </li> </ul> <li> @@ -1519,7 +1520,6 @@ need to be connected to the NPS intranet. <p> <a href="https://docs.oracle.com/en/java/javase/index.html" target="_blank">Javadoc documentation</a> - (<a href="https://docs.oracle.com/en/java/javase/14" target="_blank">JDK 14</a>) is helpful, be sure to download a local copy Javadoc for faster performance. </p> <ul> @@ -1552,7 +1552,8 @@ need to be connected to the NPS intranet. <code><b>NETBEANS_HOME/etc/netbeans.conf</b></code> locations in the NetBeans installation directory tree: <br /> - <code style="color:darkgreen"><b>C:\Program Files\NetBeans12.0\netbeans\etc\netbeans.conf</b></code> (default user settings) + <code style="color:darkgreen"><b>C:\Program Files\NetBeans12.2\netbeans\etc\netbeans.conf</b></code> (default user settings) + <br /> or, for older versions of NetBeans, <br /> <code style="color:darkgreen"><b>C:\Program Files\NetBeans 8.2\etc\netbeans.conf</b></code> (default user settings) or @@ -1566,7 +1567,7 @@ need to be connected to the NPS intranet. by changing menu <i>Tools > Java Platforms</i> and also <code style="color:darkgreen"><b>netbeans.conf</b></code> property - <code>netbeans_jdkhome="C:\Program Files\Java\openjdk\jdk-15.0.1"</code> + <code>netbeans_jdkhome="C:\Program Files\Java\openjdk\jdk-15.0.2"</code> (for example). </li> <li> @@ -1577,7 +1578,7 @@ need to be connected to the NPS intranet. <code style="color:darkgreen"><b>-J-Djavax.xml.bind.context.factory=com.sun.xml.bind.v2.ContextFactory</b></code> </li> <li> - (TODO test, reportedly + (Prior problem, <a href="https://netbeans.apache.org/download/nb113/index.html#_hidpi">fixed</a> under NetBeans 11.3) <br /> <a href="https://stackoverflow.com/questions/23651486/netbeans-ide-scaling-on-windows-8-10" target="_blank">NetBeans IDE scaling on Windows 8/10</a>: @@ -2986,7 +2987,7 @@ which can lead to the Internet of Things becoming the Web of Things. </i> <a href="https://savage.nps.edu/developers.html">https://savage.nps.edu/developers.html</a> </blockquote> <blockquote> - Revised 27 October 2020. + Revised 20 February 2021. </blockquote> <p> diff --git a/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml new file mode 100644 index 0000000000000000000000000000000000000000..230278d2a61630dd3d72e5c4d5f059b50d5ab21c --- /dev/null +++ b/nbproject/ide-file-targets.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project basedir=".." name="X3D examples: Savage-IDE"> + <path id="classpath"> + <pathelement path="classes;lib/CreateContentCatalog.jar;lib/X3DJSAIL.4.0.full.jar;lib/ant-contrib-1.0b3.jar;lib/jslint4java-2.0.5.jar;lib/json-schema-validator-2.2.6-lib.jar"/> + </path> + <!-- TODO: edit the following target according to your needs --> + <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#runsingle) --> + <target name="debug-selected-file-in-examples"> + <fail unless="debug.class">Must set property 'debug.class'</fail> + <nbjpdastart addressproperty="jpda.address" name="X3D examples: X3dForAdvancedModeling" transport="dt_socket"> + <classpath refid="classpath"/> + </nbjpdastart> + <java classname="${debug.class}" fork="true"> + <classpath refid="classpath"/> + <jvmarg value="-Xdebug"/> + <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/> + </java> + </target> + <!-- TODO: edit the following target according to your needs --> + <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#runsingle) --> + <target name="run-selected-file-in-examples"> + <fail unless="run.class">Must set property 'run.class'</fail> + <java classname="${run.class}" failonerror="true" fork="true"> + <classpath refid="classpath"/> + </java> + </target> + <!-- TODO: edit the following target according to your needs --> + <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#compilesingle) --> + <target name="compile-selected-files-in-examples"> + <fail unless="files">Must set property 'files'</fail> + <mkdir dir="classes"/> + <javac debug="on" destdir="classes" failonerror="false" includeantruntime="false" includes="${files}" source="1.8" srcdir=".." verbose="false"> + <classpath refid="classpath"/> + </javac> + </target> +</project>