diff --git a/Readme.md b/Readme.md index bfa166a..e736372 100644 --- a/Readme.md +++ b/Readme.md @@ -55,7 +55,7 @@ Go in-depth on creating joints that can be produced on a CNC machine, and learn * Mortise and Tenon joints * Lap Joints -### Final Project - Week 6 +## Final Project - Week 6 Use your multi-body modelling and CAM skills to create the final project - a tool organizer for the French Cleat Wall! diff --git a/resources/examples/ParametricBox/StackableParametricBox-SewingBitsAndBobs-Remix.FCStd b/resources/examples/ParametricBox/StackableParametricBox-SewingBitsAndBobs-Remix.FCStd index ecedb1d..8fa6ef9 100644 Binary files a/resources/examples/ParametricBox/StackableParametricBox-SewingBitsAndBobs-Remix.FCStd and b/resources/examples/ParametricBox/StackableParametricBox-SewingBitsAndBobs-Remix.FCStd differ diff --git a/resources/examples/ParametricBox/StackableParametricBox-SewingRemix.FCStd b/resources/examples/ParametricBox/StackableParametricBox-SewingRemix.FCStd index 4919016..78fdc43 100644 Binary files a/resources/examples/ParametricBox/StackableParametricBox-SewingRemix.FCStd and b/resources/examples/ParametricBox/StackableParametricBox-SewingRemix.FCStd differ diff --git a/week3/ParametricBox.FCStd b/week3/ParametricBox.FCStd deleted file mode 100644 index 23e9cea..0000000 Binary files a/week3/ParametricBox.FCStd and /dev/null differ diff --git a/week3/ParametricBoxAdjustedBits.FCStd b/week3/ParametricBoxAdjustedBits.FCStd deleted file mode 100644 index ad8f5d9..0000000 Binary files a/week3/ParametricBoxAdjustedBits.FCStd and /dev/null differ diff --git a/week3/ParametricBox_Bottom.FCStd b/week3/ParametricBox_Bottom.FCStd deleted file mode 100644 index 8547741..0000000 Binary files a/week3/ParametricBox_Bottom.FCStd and /dev/null differ diff --git a/week3/ParametricBox_Simple-BottomStartingPoint-noCAM.FCStd b/week3/ParametricBox_Simple-BottomStartingPoint-noCAM.FCStd new file mode 100644 index 0000000..da039b9 Binary files /dev/null and b/week3/ParametricBox_Simple-BottomStartingPoint-noCAM.FCStd differ diff --git a/week3/ParametricBox_Simple-withCAM.FCStd b/week3/ParametricBox_Simple-withCAM.FCStd new file mode 100644 index 0000000..34a3326 Binary files /dev/null and b/week3/ParametricBox_Simple-withCAM.FCStd differ diff --git a/week3/ParametricBox_Stackable-noCAM.FCStd b/week3/ParametricBox_Stackable-noCAM.FCStd new file mode 100644 index 0000000..aa99c07 Binary files /dev/null and b/week3/ParametricBox_Stackable-noCAM.FCStd differ diff --git a/week3/ParametricBox_Stackable-withCAM.FCStd b/week3/ParametricBox_Stackable-withCAM.FCStd new file mode 100644 index 0000000..84ffb64 Binary files /dev/null and b/week3/ParametricBox_Stackable-withCAM.FCStd differ diff --git a/week3/SewingBox.FCStd b/week3/SewingBox.FCStd new file mode 100644 index 0000000..082973b Binary files /dev/null and b/week3/SewingBox.FCStd differ diff --git a/week3/StackableParametricBox-noCAM.FCStd b/week3/StackableParametricBox-noCAM.FCStd deleted file mode 100644 index cc3ee54..0000000 Binary files a/week3/StackableParametricBox-noCAM.FCStd and /dev/null differ diff --git a/week3/StackableParametricBox-updApr30.FCStd b/week3/StackableParametricBox-updApr30.FCStd deleted file mode 100644 index 5c3f763..0000000 Binary files a/week3/StackableParametricBox-updApr30.FCStd and /dev/null differ diff --git a/week3/StackableParametricBox.FCStd b/week3/StackableParametricBox.FCStd deleted file mode 100644 index 5c76d25..0000000 Binary files a/week3/StackableParametricBox.FCStd and /dev/null differ diff --git a/week3/Toolbox.FCStd b/week3/Toolbox.FCStd deleted file mode 100644 index 5f4f97e..0000000 Binary files a/week3/Toolbox.FCStd and /dev/null differ diff --git a/week4/Metropolis/Metropolis-Black.otf b/week4/Metropolis/Metropolis-Black.otf new file mode 100644 index 0000000..3abd623 Binary files /dev/null and b/week4/Metropolis/Metropolis-Black.otf differ diff --git a/week4/Metropolis/Metropolis-BlackItalic.otf b/week4/Metropolis/Metropolis-BlackItalic.otf new file mode 100644 index 0000000..3d6a9e4 Binary files /dev/null and b/week4/Metropolis/Metropolis-BlackItalic.otf differ diff --git a/week4/Metropolis/Metropolis-Bold.otf b/week4/Metropolis/Metropolis-Bold.otf new file mode 100644 index 0000000..a42b941 Binary files /dev/null and b/week4/Metropolis/Metropolis-Bold.otf differ diff --git a/week4/Metropolis/Metropolis-BoldItalic.otf b/week4/Metropolis/Metropolis-BoldItalic.otf new file mode 100644 index 0000000..f242515 Binary files /dev/null and b/week4/Metropolis/Metropolis-BoldItalic.otf differ diff --git a/week4/Metropolis/Metropolis-ExtraBold.otf b/week4/Metropolis/Metropolis-ExtraBold.otf new file mode 100644 index 0000000..ca0b9ec Binary files /dev/null and b/week4/Metropolis/Metropolis-ExtraBold.otf differ diff --git a/week4/Metropolis/Metropolis-ExtraBoldItalic.otf b/week4/Metropolis/Metropolis-ExtraBoldItalic.otf new file mode 100644 index 0000000..667c708 Binary files /dev/null and b/week4/Metropolis/Metropolis-ExtraBoldItalic.otf differ diff --git a/week4/Metropolis/Metropolis-ExtraLight.otf b/week4/Metropolis/Metropolis-ExtraLight.otf new file mode 100644 index 0000000..b02e041 Binary files /dev/null and b/week4/Metropolis/Metropolis-ExtraLight.otf differ diff --git a/week4/Metropolis/Metropolis-ExtraLightItalic.otf b/week4/Metropolis/Metropolis-ExtraLightItalic.otf new file mode 100644 index 0000000..2740b28 Binary files /dev/null and b/week4/Metropolis/Metropolis-ExtraLightItalic.otf differ diff --git a/week4/Metropolis/Metropolis-Light.otf b/week4/Metropolis/Metropolis-Light.otf new file mode 100644 index 0000000..b8b917c Binary files /dev/null and b/week4/Metropolis/Metropolis-Light.otf differ diff --git a/week4/Metropolis/Metropolis-LightItalic.otf b/week4/Metropolis/Metropolis-LightItalic.otf new file mode 100644 index 0000000..717133c Binary files /dev/null and b/week4/Metropolis/Metropolis-LightItalic.otf differ diff --git a/week4/Metropolis/Metropolis-Medium.otf b/week4/Metropolis/Metropolis-Medium.otf new file mode 100644 index 0000000..239d69d Binary files /dev/null and b/week4/Metropolis/Metropolis-Medium.otf differ diff --git a/week4/Metropolis/Metropolis-MediumItalic.otf b/week4/Metropolis/Metropolis-MediumItalic.otf new file mode 100644 index 0000000..dc30091 Binary files /dev/null and b/week4/Metropolis/Metropolis-MediumItalic.otf differ diff --git a/week4/Metropolis/Metropolis-Regular.otf b/week4/Metropolis/Metropolis-Regular.otf new file mode 100644 index 0000000..737760b Binary files /dev/null and b/week4/Metropolis/Metropolis-Regular.otf differ diff --git a/week4/Metropolis/Metropolis-RegularItalic.otf b/week4/Metropolis/Metropolis-RegularItalic.otf new file mode 100644 index 0000000..14d62bc Binary files /dev/null and b/week4/Metropolis/Metropolis-RegularItalic.otf differ diff --git a/week4/Metropolis/Metropolis-SemiBold.otf b/week4/Metropolis/Metropolis-SemiBold.otf new file mode 100644 index 0000000..f9889d0 Binary files /dev/null and b/week4/Metropolis/Metropolis-SemiBold.otf differ diff --git a/week4/Metropolis/Metropolis-SemiBoldItalic.otf b/week4/Metropolis/Metropolis-SemiBoldItalic.otf new file mode 100644 index 0000000..fdbd016 Binary files /dev/null and b/week4/Metropolis/Metropolis-SemiBoldItalic.otf differ diff --git a/week4/Metropolis/Metropolis-Thin.otf b/week4/Metropolis/Metropolis-Thin.otf new file mode 100644 index 0000000..f969dcc Binary files /dev/null and b/week4/Metropolis/Metropolis-Thin.otf differ diff --git a/week4/Metropolis/Metropolis-ThinItalic.otf b/week4/Metropolis/Metropolis-ThinItalic.otf new file mode 100644 index 0000000..248bd94 Binary files /dev/null and b/week4/Metropolis/Metropolis-ThinItalic.otf differ diff --git a/week4/Metropolis/SIL Open Font License.txt b/week4/Metropolis/SIL Open Font License.txt new file mode 100644 index 0000000..2608640 --- /dev/null +++ b/week4/Metropolis/SIL Open Font License.txt @@ -0,0 +1,43 @@ +Copyright (c) 2015, Chris Simpson, with Reserved Font Name: "Metropolis". + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the copyright statement(s). + +"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. + +5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/week4/ParametricBox_Stackable-noCAM.FCStd b/week4/ParametricBox_Stackable-noCAM.FCStd new file mode 100644 index 0000000..aa99c07 Binary files /dev/null and b/week4/ParametricBox_Stackable-noCAM.FCStd differ diff --git a/week4/ParametricBox_Stackable-withCAM.FCStd b/week4/ParametricBox_Stackable-withCAM.FCStd new file mode 100644 index 0000000..84ffb64 Binary files /dev/null and b/week4/ParametricBox_Stackable-withCAM.FCStd differ diff --git a/week4/StackableParametricBox-SewingBitsAndBobs-Remix.FCStd b/week4/StackableParametricBox-SewingBitsAndBobs-Remix.FCStd new file mode 100644 index 0000000..8fa6ef9 Binary files /dev/null and b/week4/StackableParametricBox-SewingBitsAndBobs-Remix.FCStd differ diff --git a/week4/StackableParametricBox-SewingRemix.FCStd b/week4/StackableParametricBox-SewingRemix.FCStd new file mode 100644 index 0000000..78fdc43 Binary files /dev/null and b/week4/StackableParametricBox-SewingRemix.FCStd differ diff --git a/week4/box_example/miniCoffin_dovetailTest-v2.FCStd b/week4/box_example/miniCoffin_dovetailTest-v2.FCStd deleted file mode 100644 index 240ddb0..0000000 Binary files a/week4/box_example/miniCoffin_dovetailTest-v2.FCStd and /dev/null differ diff --git a/week4/scarf_joint/scarfjoint.FCStd b/week4/scarf_joint/scarfjoint.FCStd deleted file mode 100644 index 4c7c032..0000000 Binary files a/week4/scarf_joint/scarfjoint.FCStd and /dev/null differ diff --git a/week5/StackableParametricBox-noOperations.FCStd b/week5/ParametricBox_Stackable-noCAM.FCStd similarity index 100% rename from week5/StackableParametricBox-noOperations.FCStd rename to week5/ParametricBox_Stackable-noCAM.FCStd diff --git a/week5/SewingBox-DovetailStartingPoint.FCStd b/week5/SewingBox-DovetailStartingPoint.FCStd new file mode 100644 index 0000000..082973b Binary files /dev/null and b/week5/SewingBox-DovetailStartingPoint.FCStd differ diff --git a/week4/blind_dovetail/blindDovetailJoint-Assembly.bin b/week5/blind_boxJoint/blindBoxJoint-Assembly.bin similarity index 100% rename from week4/blind_dovetail/blindDovetailJoint-Assembly.bin rename to week5/blind_boxJoint/blindBoxJoint-Assembly.bin diff --git a/week4/blind_dovetail/blindDovetailJoint-Assembly.gltf b/week5/blind_boxJoint/blindBoxJoint-Assembly.gltf similarity index 100% rename from week4/blind_dovetail/blindDovetailJoint-Assembly.gltf rename to week5/blind_boxJoint/blindBoxJoint-Assembly.gltf diff --git a/week4/blind_dovetail/blindDovetailJoint.FCStd b/week5/blind_boxJoint/blindBoxJoint.FCStd similarity index 100% rename from week4/blind_dovetail/blindDovetailJoint.FCStd rename to week5/blind_boxJoint/blindBoxJoint.FCStd diff --git a/week4/blind_dovetail/blindDovetailTest.FCStd b/week5/blind_boxJoint/blindBoxJointTest.FCStd similarity index 100% rename from week4/blind_dovetail/blindDovetailTest.FCStd rename to week5/blind_boxJoint/blindBoxJointTest.FCStd diff --git a/week4/blind_dovetail/blinddovetailrender.blend b/week5/blind_boxJoint/blindBoxJointrender.blend similarity index 100% rename from week4/blind_dovetail/blinddovetailrender.blend rename to week5/blind_boxJoint/blindBoxJointrender.blend diff --git a/week4/blind_dovetail/blinddovetailrender.blend1 b/week5/blind_boxJoint/blindBoxJointrender.blend1 similarity index 100% rename from week4/blind_dovetail/blinddovetailrender.blend1 rename to week5/blind_boxJoint/blindBoxJointrender.blend1 diff --git a/week4/blind_dovetail/render.png b/week5/blind_boxJoint/render.png similarity index 100% rename from week4/blind_dovetail/render.png rename to week5/blind_boxJoint/render.png diff --git a/week4/blind_dovetail/render2.png b/week5/blind_boxJoint/render2.png similarity index 100% rename from week4/blind_dovetail/render2.png rename to week5/blind_boxJoint/render2.png diff --git a/week4/blind_dovetail/render3.png b/week5/blind_boxJoint/render3.png similarity index 100% rename from week4/blind_dovetail/render3.png rename to week5/blind_boxJoint/render3.png diff --git a/week4/box_example/miniCoffin_dovetailTest.FCStd b/week5/box_example/miniCoffin_dovetailTest.FCStd similarity index 100% rename from week4/box_example/miniCoffin_dovetailTest.FCStd rename to week5/box_example/miniCoffin_dovetailTest.FCStd diff --git a/week5/box_example/miniCoffin_dovetails+hiddenBoxJoints.FCStd b/week5/box_example/miniCoffin_dovetails+hiddenBoxJoints.FCStd new file mode 100644 index 0000000..8e64b54 Binary files /dev/null and b/week5/box_example/miniCoffin_dovetails+hiddenBoxJoints.FCStd differ diff --git a/week4/dovetail_joint/dovetail.FCStd b/week5/dovetail_joint/dovetail.FCStd similarity index 100% rename from week4/dovetail_joint/dovetail.FCStd rename to week5/dovetail_joint/dovetail.FCStd diff --git a/week5/slab_surfacing/slab-varSet.FCStd b/week5/slab_surfacing/slab-varSet.FCStd new file mode 100644 index 0000000..99612c3 Binary files /dev/null and b/week5/slab_surfacing/slab-varSet.FCStd differ