diff --git a/animation/sniper-standup.json b/animation/sniper-standup.json new file mode 100644 index 0000000..b8ee08d --- /dev/null +++ b/animation/sniper-standup.json @@ -0,0 +1,6 @@ +{ + "alt_text": "A 3d sculpt of a short, brown haired girl. It’s only a bust.", + "date": "2020-12-12", + "title": "Sniper Stand-up Test", + "tags": ["Animation"] +} diff --git a/art/lantern.json b/art/lantern.json deleted file mode 100644 index b3d74ea..0000000 --- a/art/lantern.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "date": "2016", - "title": "Lantern" -} diff --git a/art/pc-vs-quest.json b/art/pc-vs-quest.json deleted file mode 100644 index 1e5dc01..0000000 --- a/art/pc-vs-quest.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "characters": [ - "Sakura" - ], - "date": "2021", - "nsfw": false, - "title": "Sakura (PC vs Quest poly)" -} diff --git a/assets/3d.png b/assets/3d.png new file mode 100644 index 0000000..7919864 Binary files /dev/null and b/assets/3d.png differ diff --git a/assets/3d/sakura.glb b/assets/3d/sakura-avatar.glb similarity index 100% rename from assets/3d/sakura.glb rename to assets/3d/sakura-avatar.glb diff --git a/assets/3d/sakura.webp b/assets/3d/sakura-avatar.webp similarity index 100% rename from assets/3d/sakura.webp rename to assets/3d/sakura-avatar.webp diff --git a/assets/animation/sniper-standup.webm b/assets/animation/sniper-standup.webm new file mode 100644 index 0000000..cb4ebaa Binary files /dev/null and b/assets/animation/sniper-standup.webm differ diff --git a/assets/animation/sniper-standup.webp b/assets/animation/sniper-standup.webp new file mode 100644 index 0000000..5f5000c Binary files /dev/null and b/assets/animation/sniper-standup.webp differ diff --git a/assets/art/lantern.webp b/assets/art/lantern.webp deleted file mode 100644 index 3c6806b..0000000 Binary files a/assets/art/lantern.webp and /dev/null differ diff --git a/assets/art/pc-vs-quest.webp b/assets/art/pc-vs-quest.webp deleted file mode 100644 index 1ade2b3..0000000 Binary files a/assets/art/pc-vs-quest.webp and /dev/null differ diff --git a/assets/play-circle.png b/assets/play-circle.png new file mode 100644 index 0000000..864c903 Binary files /dev/null and b/assets/play-circle.png differ diff --git a/config.yaml b/config.yaml index 5d24906..b9bfb24 100644 --- a/config.yaml +++ b/config.yaml @@ -57,30 +57,27 @@ menu: - name: 'Art' url: '/art' weight: 2 - - name: '3D' - url: '/3D' - weight: 3 - name: 'Music' url: '/music' - weight: 4 + weight: 3 - name: 'Software' url: '/software' - weight: 5 + weight: 4 - name: 'Videos' url: 'https://tube.ryne.moe/@redchannel' - weight: 6 + weight: 5 - name: 'Downloads' url: '/downloads' - weight: 7 + weight: 6 - name: 'Links' url: '/links' - weight: 8 + weight: 7 - name: 'Guestbook' url: '/guestbook' - weight: 9 + weight: 8 - name: 'About' url: '/about' - weight: 10 + weight: 9 footer: - name: 'Blog Feed' url: '/blog/index.xml' diff --git a/content/art/2020/sniper-standup.md b/content/art/2020/sniper-standup.md new file mode 100644 index 0000000..4255293 --- /dev/null +++ b/content/art/2020/sniper-standup.md @@ -0,0 +1,11 @@ +--- +title: Sniper Stand-up Test +date: 2020-12-12 +layout: art-detail +filename: /animation/sniper-standup.webm +alt_text: "A 3d sculpt of a short, brown haired girl. It’s only a bust." +slug: sniper-standup +animation: true +arttags: +- animation +--- diff --git a/content/art/2021/pc-vs-quest.md b/content/art/2021/pc-vs-quest.md deleted file mode 100644 index cfae782..0000000 --- a/content/art/2021/pc-vs-quest.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Sakura (PC vs Quest poly) -date: 2021-01-01 -excludefeed: true -layout: art-detail -filename: /art/pc-vs-quest.webp -slug: pc-vs-quest -characters: -- Sakura -nsfw: false ---- diff --git a/content/art/_index.md b/content/art/_index.md index 8f1280f..698be3b 100644 --- a/content/art/_index.md +++ b/content/art/_index.md @@ -2,7 +2,7 @@ title: Art layout: art summary: My personal art gallery. -new_banner: You can now view select 3D pieces in your browser! +new_banner: You can now view select 3D pieces in your browser! Animations are slowly being added back too. commissions: true aliases: - /gallery diff --git a/content/art/stats/_index.md b/content/art/stats/_index.md index c65018a..31ecb9a 100644 --- a/content/art/stats/_index.md +++ b/content/art/stats/_index.md @@ -1,22 +1,22 @@ --- title: Stats layout: art-stats -total: 187 +total: 186 years: - year: 2019 num: 60 - year: 2022 num: 46 - year: 2020 - num: 29 + num: 30 - year: 2021 - num: 28 + num: 27 - year: 2023 num: 8 -- year: 2016 - num: 8 - year: 2018 num: 7 +- year: 2016 + num: 7 - year: 2017 num: 1 characters: @@ -26,23 +26,25 @@ characters: num: 9 - name: Merume num: 7 -- name: Sakura - num: 5 - name: Mari num: 5 - name: Asuka num: 5 - name: Mythra num: 4 -- name: Elisanne - num: 2 +- name: Sakura + num: 4 - name: Byleth num: 2 -- name: Tifa +- name: Rei + num: 2 +- name: Elisanne num: 2 tags: - name: technical num: 1 +- name: animation + num: 1 - name: landscape num: 7 - name: drawpile diff --git a/data/3d.json b/data/3d.json deleted file mode 100644 index 143223f..0000000 --- a/data/3d.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "categories": [ - { - "name": "Uncategorized", - "description": "Test", - "years": [ - { - "year": 2016, - "pieces": [ - { - "title": "Lantern", - "filename": "lantern.glb" - } - ] - }, - { - "year": 2022, - "pieces": [ - { - "title": "Sakura", - "filename": "sakura.glb" - } - ] - }, - { - "year": 2023, - "pieces": [ - { - "title": "Planet Express Ship", - "filename": "planet-express-ship.glb" - } - ] - } - ] - } - ] -} diff --git a/data/art-config.json b/data/art-config.json index d4dcb3e..ca59014 100644 --- a/data/art-config.json +++ b/data/art-config.json @@ -4,6 +4,6 @@ "goinghome", "orbit-correction" ], - "new-banner": "You can now view select 3D pieces in your browser!", + "new-banner": "You can now view select 3D pieces in your browser! Animations are slowly being added back too.", "commissions": true } diff --git a/resources/_gen/images/sakura-avatar_hu4fb686bdb454a4912b8891039c33c722_10482_400x0_resize_q75_h2_box_2.webp b/resources/_gen/images/sakura-avatar_hu4fb686bdb454a4912b8891039c33c722_10482_400x0_resize_q75_h2_box_2.webp new file mode 100644 index 0000000..7d3631c Binary files /dev/null and b/resources/_gen/images/sakura-avatar_hu4fb686bdb454a4912b8891039c33c722_10482_400x0_resize_q75_h2_box_2.webp differ diff --git a/resources/_gen/images/sniper-standup_hu2a25c7d2599d4f57cc9871fd3d46c655_12400_400x0_resize_q75_h2_box_2.webp b/resources/_gen/images/sniper-standup_hu2a25c7d2599d4f57cc9871fd3d46c655_12400_400x0_resize_q75_h2_box_2.webp new file mode 100644 index 0000000..6926128 Binary files /dev/null and b/resources/_gen/images/sniper-standup_hu2a25c7d2599d4f57cc9871fd3d46c655_12400_400x0_resize_q75_h2_box_2.webp differ diff --git a/scripts/gen_art.py b/scripts/gen_art.py index 99ad6a6..15f5f3a 100644 --- a/scripts/gen_art.py +++ b/scripts/gen_art.py @@ -7,7 +7,7 @@ def write_field(f, key, value): f.write(key + ": " + value + "\n") -def parse_art_json(output_directory, filename, json_file, threed = False): +def parse_art_json(output_directory, filename, json_file, threed = False, animation = False): json_data = json.load(json_file) year = None @@ -46,7 +46,10 @@ def parse_art_json(output_directory, filename, json_file, threed = False): if "camera-fov" in json_data: write_field(f, 'fov', json_data["camera-fov"]) else: - write_field(f, 'filename', '/art/' + filename + '.webp') + if animation: + write_field(f, 'filename', '/animation/' + filename + '.webm') + else: + write_field(f, 'filename', '/art/' + filename + '.webp') if "alt_text" in json_data: write_field(f, 'alt_text', @@ -57,6 +60,9 @@ def parse_art_json(output_directory, filename, json_file, threed = False): if threed: write_field(f, 'threed', 'true') + if animation: + write_field(f, 'animation', 'true') + characters = [] if "characters" in json_data: f.write("characters:\n") @@ -97,6 +103,7 @@ def parse_art_json(output_directory, filename, json_file, threed = False): art_data_directory = '../art' threed_data_directory = '../3d' +animation_data_directory = '../animation' art_output_directory = '../content/art' shutil.rmtree(art_output_directory) @@ -168,6 +175,35 @@ for filename in os.listdir(threed_data_directory): collected_years.add(year) total_art += 1 +for filename in os.listdir(animation_data_directory): + f = os.path.join(animation_data_directory, filename) + + if os.path.isfile(f): + filename_without_ext = os.path.splitext(filename)[0] + + with open(f, "r") as file: + year, characters, tags = parse_art_json(art_output_directory, filename_without_ext, file, False, True) + + if year in year_stats: + year_stats[year] += 1 + else: + year_stats[year] = 1 + + for character in characters: + if character in character_stats: + character_stats[character] += 1 + else: + character_stats[character] = 1 + + for tag in tags: + if tag in tag_stats: + tag_stats[tag] += 1 + else: + tag_stats[tag] = 1 + + collected_years.add(year) + total_art += 1 + for year in collected_years: with open(os.path.join(art_output_directory, str(year), '_index.md'), 'w') as f: f.write('---\n') @@ -245,4 +281,4 @@ with open(art_output_directory + '/stats/_index.md', 'w') as f: f.write('- name: ' + str(name) + '\n') f.write(' num: ' + str(num) + '\n') - f.write('---\n') \ No newline at end of file + f.write('---\n') diff --git a/themes/red/assets/css/site.css b/themes/red/assets/css/site.css index 51cf026..d6644fd 100644 --- a/themes/red/assets/css/site.css +++ b/themes/red/assets/css/site.css @@ -433,7 +433,7 @@ pre { } model-viewer { - height: 100vh; + height: 600px; width: 100%; margin-left: auto; margin-right: auto; diff --git a/themes/red/layouts/_default/3d-gallery.html b/themes/red/layouts/_default/3d-gallery.html deleted file mode 100644 index 1e27a04..0000000 --- a/themes/red/layouts/_default/3d-gallery.html +++ /dev/null @@ -1,34 +0,0 @@ -{{ define "main" }} -

{{ .Title }}

- -
- - {{ .Content }} - - {{ $art := (index site.Data ($.Param "json")) }} - {{ $newgrounds_icon := resources.Get "newgrounds.webp" }} - - {{ range $art.categories }} -

{{ .name }}

-

{{ .description }}

- {{ range sort .years "year" "desc" }} -

{{ .year }}

- -
- {{ range .pieces }} - {{ $full := resources.Get (printf "%s/%s" ($.Param "json") .filename) }} - - {{ with resources.Get $full }} - - {{ end }} - {{ end }} -
- {{ end }} - {{ end }} - - {{ $site := resources.Get "js/model-viewer.min.js" }} - {{ if hugo.IsProduction }} - {{ $site = $site | minify | fingerprint | resources.PostProcess }} - {{ end }} - -{{ end }} diff --git a/themes/red/layouts/_default/art-detail.html b/themes/red/layouts/_default/art-detail.html index 12da995..104ba73 100644 --- a/themes/red/layouts/_default/art-detail.html +++ b/themes/red/layouts/_default/art-detail.html @@ -5,12 +5,20 @@ {{ with resources.Get .Params.filename }} {{ if $.Params.threed }} - {{ $cameraorbit := $.Params.orbit }} - {{ $cameratarget := $.Params.target }} - {{ $fov := $.Params.fov }} - + {{ $cameraorbit := $.Params.orbit }} + {{ $cameratarget := $.Params.target }} + {{ $fov := $.Params.fov }} + {{ else }} - {{ $.Params.alt_text }} + {{ if $.Params.animation }} +
+ +
+ {{ else }} + {{ $.Params.alt_text }} + {{ end }} {{ end }} {{ end }} diff --git a/themes/red/layouts/partials/render-art.html b/themes/red/layouts/partials/render-art.html index 5a1648a..e763d01 100644 --- a/themes/red/layouts/partials/render-art.html +++ b/themes/red/layouts/partials/render-art.html @@ -3,6 +3,10 @@ {{ $base = "3d" }} {{ end }} +{{ if .Params.animation }} +{{ $base = "animation" }} +{{ end }} + {{ $full := resources.Get (printf "%s/%s.webp" $base .Params.slug) }} {{ if $full }} @@ -17,7 +21,7 @@ {{ $year = index $split 3 }} {{ end }} - + {{ $path := printf "/%s/%d/%.2d/%s" $base (int $year) (int $month) $filename_without_ext}} {{ $title := .Params.title }} @@ -28,7 +32,18 @@ {{ end }} {{ with $image }} - {{ $title }} + {{ if $.Params.threed }} + {{ with resources.Get "3d.png" }} + Viewable 3D + {{ end }} + {{ end }} + + {{ if $.Params.animation }} + {{ with resources.Get "play-circle.png" }} + Viewable Animation + {{ end }} + {{ end }} + {{ $title }} {{ else }}

Thumbnail not found!

{{ end }}