diff --git a/README.md b/README.md index e6925ec..f4cb247 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Rumfoords +# Code Study Boilerplate **Local Development** diff --git a/app.html b/app.html index 123f64c..ed57dc5 100644 --- a/app.html +++ b/app.html @@ -1,10 +1,3 @@ - diff --git a/assets/scss/_base.scss b/assets/scss/_base.scss index 2b22558..946dae8 100755 --- a/assets/scss/_base.scss +++ b/assets/scss/_base.scss @@ -1,5 +1,5 @@ @import 'vars'; -@import url('https://fonts.googleapis.com/css2?family=EB+Garamond:ital,wght@0,400;0,700;1,400;1,700&family=Poppins:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=EB+Garamond:ital,wght@0,400;0,700;1,400;1,700&family=IBM+Plex+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap'); html { font-size: 16px; @@ -12,7 +12,7 @@ body { --black: #000000; --white: #ffffff; - --font-sans: 'Poppins', sans-serif; + --font-sans: 'IBM Plex Sans', sans-serif; --font-serif: 'EB Garamond', serif; @include fontSize(16px); @@ -107,20 +107,15 @@ a { path { transition: fill 0.3s; } - - @include hover { - color: var(--white); - - path { - fill: var(--white); - } + &:hover { + text-decoration: underline; } } .contained { padding-right: var(--margin); padding-left: var(--margin); - // max-width: 1380px; + max-width: 1200px; margin-right: auto; margin-left: auto; } diff --git a/components/LoadingSpinner.vue b/components/LoadingSpinner.vue new file mode 100644 index 0000000..ef56223 --- /dev/null +++ b/components/LoadingSpinner.vue @@ -0,0 +1,32 @@ + diff --git a/components/RenderSettings.vue b/components/RenderSettings.vue new file mode 100644 index 0000000..7fd327f --- /dev/null +++ b/components/RenderSettings.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/components/StudyBody.vue b/components/StudyBody.vue new file mode 100644 index 0000000..534cb50 --- /dev/null +++ b/components/StudyBody.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/components/ThreeBoilerplate.vue b/components/ThreeBoilerplate.vue deleted file mode 100644 index 96f05a2..0000000 --- a/components/ThreeBoilerplate.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/svg/facebook-clipped.vue b/components/svg/facebook-clipped.vue new file mode 100644 index 0000000..cee3cef --- /dev/null +++ b/components/svg/facebook-clipped.vue @@ -0,0 +1,47 @@ + + + diff --git a/components/svg/social/social-facebook.vue b/components/svg/social/social-facebook.vue index 255e297..76d98e7 100644 --- a/components/svg/social/social-facebook.vue +++ b/components/svg/social/social-facebook.vue @@ -1,5 +1,6 @@ \ No newline at end of file + diff --git a/components/svg/social/social-instagram.vue b/components/svg/social/social-instagram.vue index 127d7bc..9d78085 100644 --- a/components/svg/social/social-instagram.vue +++ b/components/svg/social/social-instagram.vue @@ -1,5 +1,6 @@ @@ -13,5 +25,18 @@ export default {} diff --git a/server/projects/intro-procedural.hipnc b/server/projects/intro-procedural.hipnc new file mode 100644 index 0000000..320fbed Binary files /dev/null and b/server/projects/intro-procedural.hipnc differ diff --git a/server/web_render.py b/server/web_render.py new file mode 100644 index 0000000..6e40d0c --- /dev/null +++ b/server/web_render.py @@ -0,0 +1,92 @@ +import tempfile +import hwebserver +import hou +import random +import json + +def render_rock(noise_offset): + try: + hou.hipFile.load("/home/nicwands/Documents/CTHDRL/code-study-boilerplate/server/projects") + except (hou.LoadWarning): + print("warning") + + nodeRender = hou.node("/out/mantra1") + nodeMountain = hou.node("/obj/BOX/mountain1") + nodeRockColor = hou.node("/obj/BOX/attribnoise1") + nodeScatter = hou.node("/obj/BOX/scatter1") + nodeTreeColor = hou.node("/obj/BOX/color_noise") + + for i in range(1, 2): + print(f"Starting render #{i}") + + # Mountain noise + nodeMountain.parm("offset").set(noise_offset) + nodeMountain.parm("elementsize").set(random.random() + 1) + + # Rock color + nodeRockColor.parm("offset").set(random.random() * 50) + nodeRockColor.parm("amplitude").set(random.random() * 10) + nodeRockColor.parm("elementsize").set(random.random() * 9 + 1) + + # Scatter + nodeScatter.parm("densityscale").set(random.random() * 2000 + 1000) + + # Tree color + nodeTreeColor.parm("offset").set(random.random() * 50) + nodeTreeColor.parm("amplitude").set(random.random() * 10) + nodeTreeColor.parm("elementsize").set(random.random() * 9 + 1) + + temp_output_file = tempfile.mkstemp(".jpg")[1] + nodeRender.render(output_file=temp_output_file) + + return temp_output_file + +@hwebserver.urlHandler("/render") +def blur_image(request): + if request.method() == "GET": + return hwebserver.Response(''' +

Upload an image

+
+ + +
+ ''') + + if request.method() != "POST": + return hwebserver.notFoundResponse(request) + + req_body = json.loads(request.body()) + + render = render_rock(req_body["noise_offset"]) + print('rendered', render) + + return hwebserver.fileResponse(render, delete_file=True) + + # image_file = request.files().get("image_file") + # if image_file is None: + # return hwebserver.errorResponse(request, "No image was posted", 422) + # image_file.saveToDisk() + + # # Use a COP network to load the image, blur it, and write it to a + # # temporary output file. + # copnet = hou.node("/img").createNode("img") + # file_cop = copnet.createNode("file") + # file_cop.parm("filename1").set(image_file.temporaryFilePath()) + + # blur_cop = copnet.createNode("blur") + # blur_cop.setFirstInput(file_cop) + # blur_cop.parm("blursize").set(10) + + # rop = copnet.createNode("rop_comp") + # rop.setFirstInput(blur_cop) + # rop.parmTuple("f").set((1, 1, 1)) + # temp_output_file = tempfile.mkstemp(".jpg")[1] + # rop.parm("copoutput").set(temp_output_file) + # rop.render() + + # copnet.destroy() + + # return hwebserver.fileResponse(temp_output_file, delete_file=True) + + +hwebserver.run(8008, True) diff --git a/static/fonts/fonts.css b/static/fonts/fonts.css index 0991838..a295f43 100755 --- a/static/fonts/fonts.css +++ b/static/fonts/fonts.css @@ -10,25 +10,3 @@ 800 - Extra Bold (Ultra Bold) 900 - Black (Heavy) */ - -@font-face { - font-family: 'SweetSans'; - font-style: normal; - font-weight: 400; - src: url('SweetSans-Regular.woff2') format('woff2'), - url('SweetSans-Regular.woff') format('woff'); -} -@font-face { - font-family: 'SweetSans'; - font-style: normal; - font-weight: 700; - src: url('SweetSans-Medium.woff2') format('woff2'), - url('SweetSans-Medium.woff') format('woff'); -} -@font-face { - font-family: 'WT-Monarch'; - font-style: normal; - font-weight: 400; - src: url('WT-Monarch.woff2') format('woff2'), - url('WT-Monarch.woff') format('woff'); -} diff --git a/static/images/favicon.png b/static/images/favicon.png deleted file mode 100644 index e594c14..0000000 Binary files a/static/images/favicon.png and /dev/null differ diff --git a/static/videos/shovel.mp4 b/static/videos/shovel.mp4 new file mode 100644 index 0000000..4c998d3 Binary files /dev/null and b/static/videos/shovel.mp4 differ diff --git a/store/browser.js b/store/browser.js index 69f1a22..d5443da 100755 --- a/store/browser.js +++ b/store/browser.js @@ -60,12 +60,12 @@ export const actions = { context.commit('FONTS_LOADING') await loadFonts([ { - name: 'SweetSans', + name: 'EB Garamund', weights: [400, 700], }, { - name: 'WT-Monarch', - weights: [400], + name: 'Poppins', + weights: [300, 400, 700], }, ]) context.commit('FONTS_LOADED')