From: Ben Beltran Date: Thu, 6 Aug 2015 15:20:02 +0000 (-0500) Subject: Merge branch 'master' of bitbucket.org:benbeltran/n-s-o-vocal X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/commitdiff_plain/78bae1f1f9a369c6b0c2ba934063d70866c79b74?hp=899b70c507fb775cbcbaecd368562599d4c345ab Merge branch 'master' of bitbucket.org:benbeltran/n-s-o-vocal Conflicts: jekyll/about.html jekyll/projects.html --- diff --git a/.rvmrc b/.rvmrc deleted file mode 100644 index 6baf41b..0000000 --- a/.rvmrc +++ /dev/null @@ -1,8 +0,0 @@ -rvm_gemset_create_on_use_flag=1 -rvm_project_rvmrc_default=1 - -rvm 1.9.3@nsovocal - -if ! command -v bundle ; then - gem install bundler -fi diff --git a/_config.yml b/_config.yml index 16acbfb..8b0d963 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,6 @@ markdown: rdiscount permalink: /:year/:month/:day/:title -exclude: Gemfile, Gemfile.lock +exclude: ["Gemfile", "Gemfile.lock"] source: jekyll paginate: 10 baseurl: "http://nsovocal.com" diff --git a/jekyll/_layouts/category_index.html b/jekyll/_layouts/category_index.html index edbe6ca..48796c9 100644 --- a/jekyll/_layouts/category_index.html +++ b/jekyll/_layouts/category_index.html @@ -4,6 +4,7 @@ layout: default
+

Cat: {{page.category}}

    {% for post in site.categories[page.category] %}
  • diff --git a/jekyll/_layouts/default.html b/jekyll/_layouts/default.html index 4b05c6f..0e2cec3 100644 --- a/jekyll/_layouts/default.html +++ b/jekyll/_layouts/default.html @@ -9,12 +9,40 @@ - N, S o Vocal • {{ page.title }} + Unlimited 🍕 {{ page.title }} + + + + + + + + + + + + + + + + + + + + diff --git a/jekyll/js/vendor/recorderjs/recorder.js b/jekyll/js/vendor/recorderjs/recorder.js new file mode 100644 index 0000000..84ec0d4 --- /dev/null +++ b/jekyll/js/vendor/recorderjs/recorder.js @@ -0,0 +1,97 @@ +(function(window){ + + var WORKER_PATH = 'recorderWorker.js'; + + var Recorder = function(source, cfg){ + var config = cfg || {}; + var bufferLen = config.bufferLen || 4096; + this.context = source.context; + this.node = (this.context.createScriptProcessor || + this.context.createJavaScriptNode).call(this.context, + bufferLen, 2, 2); + var worker = new Worker(config.workerPath || WORKER_PATH); + worker.postMessage({ + command: 'init', + config: { + sampleRate: this.context.sampleRate + } + }); + var recording = false, + currCallback; + + var self = this; + this.node.onaudioprocess = function(e){ + if (!recording) return; + self.ondata && self.ondata(e.inputBuffer.getChannelData(0)); + worker.postMessage({ + command: 'record', + buffer: [ + e.inputBuffer.getChannelData(0), + e.inputBuffer.getChannelData(1) + ] + }); + } + + this.configure = function(cfg){ + for (var prop in cfg){ + if (cfg.hasOwnProperty(prop)){ + config[prop] = cfg[prop]; + } + } + } + + this.record = function(){ + recording = true; + } + + this.stop = function(){ + recording = false; + } + + this.clear = function(){ + worker.postMessage({ command: 'clear' }); + } + + this.getBuffer = function(cb) { + currCallback = cb || config.callback; + worker.postMessage({ command: 'getBuffer' }) + } + + this.exportWAV = function(cb, type){ + currCallback = cb || config.callback; + type = type || config.type || 'audio/wav'; + if (!currCallback) throw new Error('Callback not set'); + worker.postMessage({ + command: 'exportWAV', + type: type + }); + } + + this.shutdown = function(){ + worker.terminate(); + source.disconnect(); + this.node.disconnect(); + }; + + worker.onmessage = function(e){ + var blob = e.data; + currCallback(blob); + } + + source.connect(this.node); + this.node.connect(this.context.destination); //this should not be necessary + }; + + Recorder.forceDownload = function(blob, filename){ + var url = (window.URL || window.webkitURL).createObjectURL(blob); + var link = window.document.createElement('a'); + link.href = url; + link.download = filename || 'output.wav'; + var click = document.createEvent("Event"); + click.initEvent("click", true, true); + link.dispatchEvent(click); + } + + window.Recorder = Recorder; + +})(window); diff --git a/jekyll/js/vendor/recorderjs/recorderWorker.js b/jekyll/js/vendor/recorderjs/recorderWorker.js new file mode 100644 index 0000000..08ad444 --- /dev/null +++ b/jekyll/js/vendor/recorderjs/recorderWorker.js @@ -0,0 +1,131 @@ +var recLength = 0, + recBuffersL = [], + recBuffersR = [], + sampleRate; + +this.onmessage = function(e){ + switch(e.data.command){ + case 'init': + init(e.data.config); + break; + case 'record': + record(e.data.buffer); + break; + case 'exportWAV': + exportWAV(e.data.type); + break; + case 'getBuffer': + getBuffer(); + break; + case 'clear': + clear(); + break; + } +}; + +function init(config){ + sampleRate = config.sampleRate; +} + +function record(inputBuffer){ + recBuffersL.push(inputBuffer[0]); + recBuffersR.push(inputBuffer[1]); + recLength += inputBuffer[0].length; +} + +function exportWAV(type){ + var bufferL = mergeBuffers(recBuffersL, recLength); + var bufferR = mergeBuffers(recBuffersR, recLength); + var interleaved = interleave(bufferL, bufferR); + var dataview = encodeWAV(interleaved); + var audioBlob = new Blob([dataview], { type: type }); + + this.postMessage(audioBlob); +} + +function getBuffer() { + var buffers = []; + buffers.push( mergeBuffers(recBuffersL, recLength) ); + buffers.push( mergeBuffers(recBuffersR, recLength) ); + this.postMessage(buffers); +} + +function clear(){ + recLength = 0; + recBuffersL = []; + recBuffersR = []; +} + +function mergeBuffers(recBuffers, recLength){ + var result = new Float32Array(recLength); + var offset = 0; + for (var i = 0; i < recBuffers.length; i++){ + result.set(recBuffers[i], offset); + offset += recBuffers[i].length; + } + return result; +} + +function interleave(inputL, inputR){ + var length = inputL.length + inputR.length; + var result = new Float32Array(length); + + var index = 0, + inputIndex = 0; + + while (index < length){ + result[index++] = inputL[inputIndex]; + result[index++] = inputR[inputIndex]; + inputIndex++; + } + return result; +} + +function floatTo16BitPCM(output, offset, input){ + for (var i = 0; i < input.length; i++, offset+=2){ + var s = Math.max(-1, Math.min(1, input[i])); + output.setInt16(offset, s < 0 ? s * 0x8000 : s * 0x7FFF, true); + } +} + +function writeString(view, offset, string){ + for (var i = 0; i < string.length; i++){ + view.setUint8(offset + i, string.charCodeAt(i)); + } +} + +function encodeWAV(samples){ + var buffer = new ArrayBuffer(44 + samples.length * 2); + var view = new DataView(buffer); + + /* RIFF identifier */ + writeString(view, 0, 'RIFF'); + /* RIFF chunk length */ + view.setUint32(4, 36 + samples.length * 2, true); + /* RIFF type */ + writeString(view, 8, 'WAVE'); + /* format chunk identifier */ + writeString(view, 12, 'fmt '); + /* format chunk length */ + view.setUint32(16, 16, true); + /* sample format (raw) */ + view.setUint16(20, 1, true); + /* channel count */ + view.setUint16(22, 2, true); + /* sample rate */ + view.setUint32(24, sampleRate, true); + /* byte rate (sample rate * block align) */ + view.setUint32(28, sampleRate * 4, true); + /* block align (channel count * bytes per sample) */ + view.setUint16(32, 4, true); + /* bits per sample */ + view.setUint16(34, 16, true); + /* data chunk identifier */ + writeString(view, 36, 'data'); + /* data chunk length */ + view.setUint32(40, samples.length * 2, true); + + floatTo16BitPCM(view, 44, samples); + + return view; +} diff --git a/jekyll/projects.html b/jekyll/projects.html index d6eccc5..97b2ca6 100644 --- a/jekyll/projects.html +++ b/jekyll/projects.html @@ -1,53 +1,59 @@ --- layout: default -title: Proyectos +title: Proj description: "Lista de proyectos de Ben Beltran... cosas en las que estoy o estaba trabajando y he decidido compartir." ---
    -

    Proyectos / Projects

    +

    Proj

    +

    These are some of the things I've done, worked on, + am working on, or plan to work on:
    + Estas son algunas de las cosas que he hecho, + en que he trabajado, estoy trabajando, o en que planeo trabajar:

    +
    • - Thulium: - Un sistema de templates muy rápido para javascript, con soporte - de bloques rompibles imprimibles, una sintaxis sana y spec como - se debe. - • A really fast templating engine for javascript with breakable - printable blocks, a sane syntax and a proper spec. + Serpentity — + An entity framework for making games with javascript. + Un framework de entidades para hacer juegos con javascript
    • - Cobalt: - Un multiplexor sencillo de logs en formato JSON. - • A really simple JSON format log multiplexer. + Lyricli — + A command line tool to fetch lyrics for your current song or search by title. + Herramienta de linea de comandos para ver la letra de la canción + que escuchas o buscar por título
    • - Lyricli: - Muestra lyrics en tu línea de comando - • Get lyrics right in your terminal
      • -
    • - Polarity: Un juego - Arena Shooter con magnetismo! • An Arena Shooter with - Magnetism! + Cobalt — + A JSON based log multiplexer for javascript: send to a socket or to a + file or whatever I'm not your mom. + Un multiplexor de logs basado en JSON para javascript: manda por + un socket, o un archivo o lo que quieras no soy tu mamá.
      • -
    • Polarity II (WIP): - Arena Shooter magnetico para Windows, Mac y Linux, hecho con - MonoGame• - Next version of the magnetic arena shooter polarity, for - Windows, Mac and Linux; made with magnetism. +
    • + Thulium — + A fast and simple EJS-like templating engine with support for printable blocks. + Un sistema de templates parecido a EJS rápido y sencillo con soporte + de bloques imprimibles
    • - Curso Express de C: - Curso Express de C basado en K&R que impartí en el Tecnológico de Monterrey - Campus Ciudad Juárez. Solo vienen prácticas 01-07 por ahora. - Pronto subiré los otros. - • Express C course based on K&R that I gave in Monterrey - Institute of Technology, Campus Ciudad Juarez. Only Labs 01-07 - for now, will upload the rest soon.
      • + Polarity — + The first game I made, some years back. An arena shooter with magnnetism! + El primer juego que hice, hace unos años. Un arena shooter con magnetismo! + +
    + +

    I'm also, sometimes (I swear) working on these + three game projects, and I sometimes post about them:
    + También, a veces (lo juro) trabajo en estos tres proyectos, + y a veces escribo sobre ellos: +

    + +
      +
    • Super Polarity (In Development/En desarrollo)
      • +
    • Cows (Designing/Diseñando)
      • +
    • Bctria (Designing/Diseñando)
    diff --git a/jekyll/reverb.aiff b/jekyll/reverb.aiff new file mode 100644 index 0000000..54226d5 Binary files /dev/null and b/jekyll/reverb.aiff differ diff --git a/jekyll/reverb.ogg b/jekyll/reverb.ogg new file mode 100644 index 0000000..cb7db27 Binary files /dev/null and b/jekyll/reverb.ogg differ