Browse Source

Tweak AssetBuilder, Aubio test is no longer slow

windows-imgui
Macoy Madson 2 months ago
parent
commit
418d3388f4
4 changed files with 8 additions and 11 deletions
  1. +2
    -2
      ReadMe.org
  2. +1
    -5
      src/Aubio.cake
  3. +5
    -2
      test/src/AssetBuilder.cake
  4. +0
    -2
      test/src/VocalGame.cake

+ 2
- 2
ReadMe.org View File

@ -68,9 +68,9 @@ Refer to ~test/~ for project setup.
This shouldn't be necessary because ~test/~ is set up to not clone dependencies as submodules, but if you are testing the submodules feature, this script helps undo them.
** Platform setup
*** Ogre
You may need X11 headers to build on Ubuntu:
You may need X11 headers to build on Ubuntu. You'll also need imagemagick and blender for the asset building:
#+BEGIN_SRC sh
sudo apt install libx11-xcb-dev
sudo apt install libx11-xcb-dev imagemagick blender
#+END_SRC
There is a TODO to automatically install these.
* Asset pipeline


+ 1
- 5
src/Aubio.cake View File

@ -66,11 +66,7 @@
(var detected-pitch (* fvec_t) (new_fvec buffer-size))
(aubio_pitch_do pitch-detection buffer detected-pitch)
(printf "Buffer:\n")
(fvec_print buffer)
(printf "Pitch:\n")
(fvec_print detected-pitch)
(printf "Pitch: %f\n" (fvec_get_sample detected-pitch 0))
(printf "\n")
(del_fvec buffer)


+ 5
- 2
test/src/AssetBuilder.cake View File

@ -51,9 +51,9 @@
(Log "Asset-Building: failed to build 3D asset. Is Blender on your path? Is blender2ogre set
up on your Blender default preferences? See https://github.com/OGRECave/blender2ogre for setup\n
You may need to copy blender2ogre to your new blender version, e.g.:\n\n
cp -r Dependencies/blender2ogre/io_ogre ~/.config/blender/[version]\n\n
cp -r Dependencies/blender2ogre/io_ogre ~/.config/blender/[version]/scripts/addons/\n\n
Or, open your new version of Blender and select 'Copy settings from [previous version]'\n
on the splash screen.\n")
on the splash screen. Don't forget to set Ogre XML converter to OgreMeshTool\n")
(free (type-cast model-output-dir (* void)))
(return false))
@ -111,3 +111,6 @@ path? You may need to install ImageMagick. See https://www.imagemagick.org/scrip
;; TODO: This should be a post-build hook
(add-compile-time-hook-module pre-build process-3d-assets :priority-decrease 10)
(add-dependency-git-submodule clone-blender2ogre "https://github.com/OGRECave/blender2ogre"
"Dependencies/blender2ogre")

+ 0
- 2
test/src/VocalGame.cake View File

@ -694,5 +694,3 @@
(module-use-tracy-build-options)
(import &comptime-only "Dependencies.cake")
(add-dependency-git-submodule clone-blender2ogre "https://github.com/OGRECave/blender2ogre"
"Dependencies/blender2ogre")

Loading…
Cancel
Save