diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2017-10-12 15:13:13 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2017-10-12 15:13:13 +0200 |
| commit | 964d22f599ab7f300663e4ef3dac0f8749b1076d (patch) | |
| tree | 5ab4ded280c12e230fdb34bef1839ec683e854c0 | |
| parent | b004cfd65b993a92a24767a9b022fb4e04554e7d (diff) | |
Moving all of the website into the public repo. This is a mess
216 files changed, 7235 insertions, 1748 deletions
diff --git a/Makefile b/Makefile new file mode 100755 index 0000000..d1ddf80 --- /dev/null +++ b/Makefile @@ -0,0 +1,124 @@ +PY?=python3 +PELICAN?=pelican +PELICANOPTS= + +BASEDIR=$(CURDIR) +INPUTDIR=$(BASEDIR)/content +OUTPUTDIR=$(BASEDIR)/output +CONFFILE=$(BASEDIR)/pelicanconf.py +PUBLISHCONF=$(BASEDIR)/publishconf.py + +FTP_HOST=localhost +FTP_USER=anonymous +FTP_TARGET_DIR=/ + +SSH_HOST=localhost +SSH_PORT=22 +SSH_USER=root +SSH_TARGET_DIR=/var/www + +S3_BUCKET=my_s3_bucket + +CLOUDFILES_USERNAME=my_rackspace_username +CLOUDFILES_API_KEY=my_rackspace_api_key +CLOUDFILES_CONTAINER=my_cloudfiles_container + +DROPBOX_DIR=~/Dropbox/Public/ + +GITHUB_PAGES_BRANCH=gh-pages + +DEBUG ?= 0 +ifeq ($(DEBUG), 1) + PELICANOPTS += -D +endif + +RELATIVE ?= 0 +ifeq ($(RELATIVE), 1) + PELICANOPTS += --relative-urls +endif + +help: + @echo 'Makefile for a pelican Web site ' + @echo ' ' + @echo 'Usage: ' + @echo ' make html (re)generate the web site ' + @echo ' make clean remove the generated files ' + @echo ' make regenerate regenerate files upon modification ' + @echo ' make publish generate using production settings ' + @echo ' make serve [PORT=8000] serve site at http://localhost:8000' + @echo ' make serve-global [SERVER=0.0.0.0] serve (as root) to $(SERVER):80 ' + @echo ' make devserver [PORT=8000] start/restart develop_server.sh ' + @echo ' make stopserver stop local server ' + @echo ' make ssh_upload upload the web site via SSH ' + @echo ' make rsync_upload upload the web site via rsync+ssh ' + @echo ' make dropbox_upload upload the web site via Dropbox ' + @echo ' make ftp_upload upload the web site via FTP ' + @echo ' make s3_upload upload the web site via S3 ' + @echo ' make cf_upload upload the web site via Cloud Files' + @echo ' make github upload the web site via gh-pages ' + @echo ' ' + @echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html ' + @echo 'Set the RELATIVE variable to 1 to enable relative urls ' + @echo ' ' + +html: + $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) + +clean: + [ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR) + +regenerate: + $(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) + +serve: +ifdef PORT + cd $(OUTPUTDIR) && $(PY) -m pelican.server $(PORT) +else + cd $(OUTPUTDIR) && $(PY) -m pelican.server +endif + +serve-global: +ifdef SERVER + cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 $(SERVER) +else + cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 0.0.0.0 +endif + + +devserver: +ifdef PORT + $(BASEDIR)/develop_server.sh restart $(PORT) +else + $(BASEDIR)/develop_server.sh restart +endif + +stopserver: + $(BASEDIR)/develop_server.sh stop + @echo 'Stopped Pelican and SimpleHTTPServer processes running in background.' + +publish: + $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS) + +ssh_upload: publish + scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) + +rsync_upload: publish + rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude + +dropbox_upload: publish + cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR) + +ftp_upload: publish + lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit" + +s3_upload: publish + s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type + +cf_upload: publish + cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) . + +github: publish + ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $(OUTPUTDIR) + git push origin $(GITHUB_PAGES_BRANCH) + +.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github @@ -1,114 +1,9 @@ -# Nest +www.spacekookie.de +=== -This is my very heavily customised website theme for [spacekookie.de](https://spacekookie.de). Not sure why I keep this public as it will probably never be any good for anyone. But oh well ¯\\\_(ツ)_/¯ +Dependencies are `pelican markdown webassets` -This is a fork that I created as it's own repository. The original is from [https://github.com/molivier/nest](https://github.com/molivier/nest) +The pelican build. -## Features - -* Featured site header image -* Featured article header image -* **Pygments** syntax highlighting -* **Disqus** support for comments -* **Google Analytics** support -* RSS and Atom feeds - -## Settings - -Nest template can be customized by adding parameters to your `pelicanconf.py` file. Template specifics parameters are prefixed with template name. - -### Pelican.conf example - -```python -# NEST Template -THEME = 'nest' -SITESUBTITLE = u'My Awesome Blog' -# Minified CSS -NEST_CSS_MINIFY = True -# Add items to top menu before pages -MENUITEMS = [('Homepage', '/'),('Categories','/categories.html')] -# Add header background image from content/images : 'background.jpg' -NEST_HEADER_IMAGES = '' -NEST_HEADER_LOGO = '/image/logo.png' -# Footer -NEST_SITEMAP_COLUMN_TITLE = u'Sitemap' -NEST_SITEMAP_MENU = [('Archives', '/archives.html'),('Tags','/tags.html'), ('Authors','/authors.html')] -NEST_SITEMAP_ATOM_LINK = u'Atom Feed' -NEST_SITEMAP_RSS_LINK = u'RSS Feed' -NEST_SOCIAL_COLUMN_TITLE = u'Social' -NEST_LINKS_COLUMN_TITLE = u'Links' -NEST_COPYRIGHT = u'© blogname 2015' -# Footer optional -NEST_FOOTER_HTML = '' -# index.html -NEST_INDEX_HEAD_TITLE = u'Homepage' -NEST_INDEX_HEADER_TITLE = u'My Awesome Blog' -NEST_INDEX_HEADER_SUBTITLE = u'Smashing The Stack For Fun And Profit' -NEST_INDEX_CONTENT_TITLE = u'Last Posts' -# archives.html -NEST_ARCHIVES_HEAD_TITLE = u'Archives' -NEST_ARCHIVES_HEAD_DESCRIPTION = u'Posts Archives' -NEST_ARCHIVES_HEADER_TITLE = u'Archives' -NEST_ARCHIVES_HEADER_SUBTITLE = u'Archives for all posts' -NEST_ARCHIVES_CONTENT_TITLE = u'Archives' -# article.html -NEST_ARTICLE_HEADER_BY = u'By' -NEST_ARTICLE_HEADER_MODIFIED = u'modified' -NEST_ARTICLE_HEADER_IN = u'in category' -# author.html -NEST_AUTHOR_HEAD_TITLE = u'Posts by' -NEST_AUTHOR_HEAD_DESCRIPTION = u'Posts by' -NEST_AUTHOR_HEADER_SUBTITLE = u'Posts archives' -NEST_AUTHOR_CONTENT_TITLE = u'Posts' -# authors.html -NEST_AUTHORS_HEAD_TITLE = u'Author list' -NEST_AUTHORS_HEAD_DESCRIPTION = u'Author list' -NEST_AUTHORS_HEADER_TITLE = u'Author list' -NEST_AUTHORS_HEADER_SUBTITLE = u'Archives listed by author' -# categories.html -NEST_CATEGORIES_HEAD_TITLE = u'Categories' -NEST_CATEGORIES_HEAD_DESCRIPTION = u'Archives listed by category' -NEST_CATEGORIES_HEADER_TITLE = u'Categories' -NEST_CATEGORIES_HEADER_SUBTITLE = u'Archives listed by category' -# category.html -NEST_CATEGORY_HEAD_TITLE = u'Category Archive' -NEST_CATEGORY_HEAD_DESCRIPTION = u'Category Archive' -NEST_CATEGORY_HEADER_TITLE = u'Category' -NEST_CATEGORY_HEADER_SUBTITLE = u'Category Archive' -# pagination.html -NEST_PAGINATION_PREVIOUS = u'Previous' -NEST_PAGINATION_NEXT = u'Next' -# period_archives.html -NEST_PERIOD_ARCHIVES_HEAD_TITLE = u'Archives for' -NEST_PERIOD_ARCHIVES_HEAD_DESCRIPTION = u'Archives for' -NEST_PERIOD_ARCHIVES_HEADER_TITLE = u'Archives' -NEST_PERIOD_ARCHIVES_HEADER_SUBTITLE = u'Archives for' -NEST_PERIOD_ARCHIVES_CONTENT_TITLE = u'Archives for' -# tag.html -NEST_TAG_HEAD_TITLE = u'Tag archives' -NEST_TAG_HEAD_DESCRIPTION = u'Tag archives' -NEST_TAG_HEADER_TITLE = u'Tag' -NEST_TAG_HEADER_SUBTITLE = u'Tag archives' -# tags.html -NEST_TAGS_HEAD_TITLE = u'Tags' -NEST_TAGS_HEAD_DESCRIPTION = u'Tags List' -NEST_TAGS_HEADER_TITLE = u'Tags' -NEST_TAGS_HEADER_SUBTITLE = u'Tags List' -NEST_TAGS_CONTENT_TITLE = u'Tags List' -NEST_TAGS_CONTENT_LIST = u'tagged' -# Static files -STATIC_PATHS = ['images', 'extra/robots.txt', 'extra/favicon.ico', 'extra/logo.svg'] -EXTRA_PATH_METADATA = { - 'extra/robots.txt': {'path': 'robots.txt'}, - 'extra/favicon.ico': {'path': 'favicon.ico'}, - 'extra/logo.svg': {'path': 'logo.svg'} -} -``` - - -## Third-party assets - -The theme uses external softwares, scripts, libraries and artworks: - -* [Bootstrap](http://getbootstrap.com/) 3.x.x -* [Open Sans Font](http://www.google.com/fonts/specimen/Open+Sans) +Host with `pelican content` and `make devserver` +Default port is 8000.
\ No newline at end of file diff --git a/blog_update.sh b/blog_update.sh new file mode 100755 index 0000000..017b215 --- /dev/null +++ b/blog_update.sh @@ -0,0 +1,11 @@ +# Get to the right location +sudo lxc-attach -n spacekookie +cd /var/www/website + +# Update the data +git pull + +# Re-generate +rm -rf output/ +. env/bin/activate +pelican content/
\ No newline at end of file diff --git a/content/blog/00_introduction.md b/content/blog/00_introduction.md new file mode 100644 index 0000000..dabfe55 --- /dev/null +++ b/content/blog/00_introduction.md @@ -0,0 +1,14 @@ +Title: An open source GPU +Category: Blog +Tags: OpenMPU, matrices, opengl, hardware + + +For as long as I can remember I've wanted to build my own computer. Sorta from scratch. + +And there is something I want to do even more: build a GPU. Something that can process vectors and matrecies in an efficient manner, build a graphics rendering pipeline in hardware. Sorta from scratch. + +And that's what this project is about. OpenMCU stands for "Open Matrix Computation Unit" and will be a part of the OpenGPU (working title). + +## The basic architecture + +`<insert picture>`
\ No newline at end of file diff --git a/content/blog/hardware/001-omnitool-introduction.md b/content/blog/hardware/001-omnitool-introduction.md new file mode 100755 index 0000000..dd7b5e2 --- /dev/null +++ b/content/blog/hardware/001-omnitool-introduction.md @@ -0,0 +1,57 @@ +Title: 01. Omnitool - Introduction +Slug: 01-omnitool-introduction +Category: Blog +Tags: Dev Diary, Hardware +Date: 17-09-2015 15:45 +Status: published +Illustration: omnitool_background2.jpg + +Any good fan of the game, book, comic, stuff series will now jump up and down in excitement. The omnitool is a constant companion, helper and friend for Commander Shepard and a life saver in several situations. Whether it be hacking doors, turning into a plasma blade and cutting peoples faces open or just plain transferring a bribe credit to the slimy Vorcha in front of you. + +But please, settle down, I haven't invented holographic technology. Nor have I invented plasma tubings or even solved the financial crisis by coming up with a perfect currency (of couse generically called 'credits') that everybody wants to use. + +### Then why waste your time +That's a good question :) I would hope that this series doesn't turn into a waste of time for anyone. Because...well, while I haven't done any of those things. I am planning on building an omnitool. Just a bit more low-tech. + +I was actually inspired by something on Adafruit, called the Flora. It's a round gimmick with a ring of RGB LED's, GPS (I think) and an arduino to program it. + + + +I was only really inspired to do this project when a friend of mine showed off his Flora on the CCCamp2015. + +He did some minor modifications to it, including a wristband (IDE cable) and a battery on the underside and programmed a few modes for displaying time (as an analogue clock) and a flashlight by just dialing the LED's up to full power. + + + +And that's kinda what gave me the idea for an omnitool. The idea of circular rings of LED's as display elements are pretty cool. + +### Basic concept + +So the basic conceptis a simple. Create a wrist accessory with one or two LED rings (using shift register RGP LED's to display patterns, colours and different brightness settings), include a generic SOC to program, probably something single core ARM. Give it a bunch of RAM to run applications and a embedded systems linux. + +Include GPS, blutooth, a sensor package such as temperature, preasure, accelerometer, etc. + +Include extention slots where, with a simple click, the tool can be expanded to include speakers, a microphone, a bigger screen, a bigger battery, etc. + +And all this in the form factor of the so beloved omnitool from Mass Effect. + +I know this is a bit of a crazy project. And it will take months, if not years to complete. + +Because this is the thing: I want to do it all as custom cut PCB and maybe some custom cut plastic for casings. + +I've been getting into KiCad recently, with my first project the Christmas Bauble ([Click here for details](/dev-diary/jolly-christmas-decoration/)) and have fallen in love with the tool – Don't worry Ashley, not *that* much :) + +But it is pretty awesome and I urge everybody who wants to get into that sort of electronics stuff to checkout it out! [KiCad](http://www.kicad-pcb.com) + +### What to expect + +So what will this series be? (Hopefully) regular status reports about what I've been doing, writing about my experimences with the project, letting you guys know what I'm learning and generally just let people follow the project. + +All stuff about the project will be in a Github repo. From the KiCad files to the C firmware I'll have to write. Everything you would potentially need to make your own, study it and learn from it is in there. + +**[Omnitool Repository](https://github.com/spacekookie/omnitool)** + + +I hope that you follow along. And I'm looking forwards to comments from all of you. Have a lovely day and read you soon. + +~Kate diff --git a/content/blog/hardware/002-christmas-bauble.md b/content/blog/hardware/002-christmas-bauble.md new file mode 100755 index 0000000..b0cc62c --- /dev/null +++ b/content/blog/hardware/002-christmas-bauble.md @@ -0,0 +1,33 @@ +Title: Jolly Christmas Decoration +Category: Blog +Date: 2015-09-17 15:30 +Tags: Dev Diary, Hardware + +Christmas is getting closer (not really but let's just roll with it) and I wanted to learn [KiCad](www.kicad-pcb.com) a software that let's you create circuits and design PCB for manufacture. + +I found a tutorial series online by a guy named [Ashley Mills](https://www.youtube.com/channel/UCaBNA-lmg35Wfx2eh2oDkWg) (with quite a legendary beard) who showed off a simple circuit using a 555-timer, a shift register and an XOR gate made from NPN transistors and resistors to display and repeat a pattern on several LED's. + +The series focused on getting to know KiCad and all it's features. And while I did that in the first revision of my board, I've diverged from it since. I can however recommend his videos on KiCad to anyone who wants to dive into PCB design, has no clue about the software and could use a little chuckle while also learning some really awesome software (youtube channel link above). + +### My Christmas Bauble + +So this is what I've got. + + + +As you can see it's a round PCB with simple 5mm LED's around the edges. It no longer uses NPN transistors but rather a single SMD XOR gate. Much easier to wire up, cheaper and less prone to errors as well. + +In general I've switched the entire design over to primarily use SMD components as they're smaller and more elegant. And it theoretically allowed me to get the footprint of the board down to something that isn't too excruciatingly expensive to produce. + +It took me two more revisions to get the board to a state where it's not too complex and actually fit on a single layer (!) with no vias except for the holes for the LED's obviously. + +It uses a round cell battery on the back of the board to hide it away and has a hole at the top to actually hang off a christmas tree. Theoretically the battery should lasta few days, so maybe have a few spare ones around in the christmas season. + +### What now? + +I haven't manufactured this yet. I am still thinking about refining the design slightly. I have the **entire** back to work with and add things. I was thinking about adding a simple bluetooth chip so that patterns could be pushed to the device via an android app. But that's the future. For now it should actually be functional and maybe I'll order some `Revision 3` boards just to see that everything worked. + +Here is a dynamic render from KiCad as well. + + +And be sure to checkout my Github repo for the project if you want the KiCad files. Either to play around with them or to manufacture some baubles yourself. If you do, I'd be interested in pictures of the decorations on your christmas trees so I can add them to this article as a slideshow :) diff --git a/content/blog/hardware/003-christmas-bauble-update.md b/content/blog/hardware/003-christmas-bauble-update.md new file mode 100755 index 0000000..ee4800d --- /dev/null +++ b/content/blog/hardware/003-christmas-bauble-update.md @@ -0,0 +1,38 @@ +Title: [Update] Jolly Christmas Decoration +Category: Blog +Date: 2015-11-27 15:30 +Tags: Dev Diary, Hardware + +You might remember I played around with Kicad a few months ago and made this [tacky little thing](/hardware/jolly-christmas-decoration/). Just about 2 1/2 weeks ago I went onto [DirtyPCB](http://dirtypcbs.com/) to get them actually made. I wanted to have gone through the production process and get something built before I started doing more complicated projects. + +Unfortunately I discovered a little mistake with the design in the layout that ended up at the manufacturer (Rev 3.1). I tried to fix them but Rev 3.2 didn't make it in time, which means my boards will be a bit more complicated to power. However not too complicated as the power-in are just throughholes so I can actually strap anything behind it to power it. + +But without further a due, here is the result from DirtyPCB (which I am actually quite impressed with). + + + +Now, I'm new to all of this so I started doing beep-tests on the pads to make sure things were properly connected and all the boards passed them. The production quality is pretty good. Unfortunately I can't start assembling them yet just because none of the parts I ordered for them have arrived yet. The manufacture and shipping of the boards actually beat the shipping of off-the-shelf parts! + +Anyways, I'm kinda excited. First time making an electronics project. I might post another update on when the parts arive and post a few gifs of the finished products. If I don't I'll probably tweet about it though. + +Now, I have another smaller electronics project in the making where I am, again, waiting for parts to arrive to do some testing. And already designing a modular PCB board. (Limited a bit with the 10x10cm limitations on DirtyPCB I need to design my project in a way that I can take a bunch of smaller panels and stick them together into a large one, which would take hundreds of dollars to make elsewhere). + +[But realistically for the production quality I saw with these, I'd be happy to give them my money again for future projects. Especially at that price, just unbeatable.](https://www.youtube.com/watch?v=d36wUmJGzvA) + +:) + +Anyways, enough ramblings. Read you later. + +### Update...update + +Right...so after tinkering with the bauble a bit I found out a few things. The most important one being that I made some mistakes. Some big ones :) + + - Pin 9 of the shift register was connected to both input A and input B of the XOR gate. Which meant that both inputs were always the same...which also meant that the output was always 0. + - The 555-timer clock ran at several hundred kilohertz. I had to change the capacitor down to ~12µF and the resistors to ~4.7 ohms. + - The coin-cell battery didn't have enough juice to run it. Two had to be put in parallel. Even then, two batteries would not be able to run for very long. + + To make the bauble work I bridget the xor gate completely, so just feeding back the shift register end to the beginning. + + In addition to those things some of the LED's sometimes didn't work. I'm not sure if that is due to broken shift registers, traces or LEDs. All in all I do consider it to have tought me quite a lot about electronics, going through the process of producing a PCB and debugging electronics once it arrived and inevidably goes wrong :) + +I am currently in the process of redesigning the entire circuite from scratch. And making it easier to solder. I want to make it into a beginner soldering kit that people can both learn how to solder with and also have something to hang off their christmas tree in the jolly season. diff --git a/content/blog/hardware/004-ws2812b-breakouts.md b/content/blog/hardware/004-ws2812b-breakouts.md new file mode 100755 index 0000000..190d100 --- /dev/null +++ b/content/blog/hardware/004-ws2812b-breakouts.md @@ -0,0 +1,21 @@ +Title: WS2812b LED breakouts +Category: Blog +Date: 2016-03-16 12:08 +Tags: Dev Diary, Hardware + +You all know I have a fetish for [ws2812b RGB-LEDs](http://rgb-123.com/wp-content/uploads/2013/08/PinLayout.jpg). I admit that. They're just awesome. And recently I've found myself wanting to do some projects with them (*cough* programmable alarm clock *cough*). But I dislike the strips, although they're pretty cheap they are usually just very messy and horrible. And making a PCB for every project can be weird. Especially if gigantic PCBs would be required. + +So I designed this little doodad. + + + +The idea is the following: Sometimes you just need a few ws2812b (I'm saying that word too often in this post) somewhere. But you don't want to lay a strip. Or make a big PCB for it. +So here is an alternative. Easily make ~800 of these for 25$, screw them to a surface, connect **PRETTY** wires between them, such as [Ribbon cables](http://cdn.usdigital.com/assets/images/galleries/ca-c10-f-c10_0.jpg) and boom. You're done. + +### One to rule many + +Now...I mentioned that programmable alarm clock earlier. And while I'm not quite done designing what will go into it all, I do know that I want to have a ~ 21x9 Pixel display, each individually addressable. And instead of building a way too big PCB that will be insanely expensive to manufacture...why not split them up? Then I have these "tiles" of LEDs that I screw to a backplate, wire everything together and from the outside you can't tell the difference. + +With 21:9 (Aspect ratio and pixels) in mind, this is my prototype: + +<TO BE CONTINUED>
\ No newline at end of file diff --git a/content/blog/hardware/005-open-plantb0t.md b/content/blog/hardware/005-open-plantb0t.md new file mode 100755 index 0000000..647ddf3 --- /dev/null +++ b/content/blog/hardware/005-open-plantb0t.md @@ -0,0 +1,51 @@ +Title: Open Plantb0t - Rev A +Category: Blog +Date: 2016-03-16 12:08 +Tags: Dev Diary, Hardware +Illustration: banners/plantb0t_revA.png + +Howdy everybody, + +Spring is coming in Berlin and thus my thoughts - as every year - are with plants. And growing shit. I live in an appartment with a tiny tiny balcony so I don't have much space but that has never stopped me from wanting to cram as many plants into the space as possible to the point of starting nuclear fusion. + +In addition to that I have a few house-plants and very water-sensitive trees in my appartment. My current approach is to go around with a jug of water every couple of days and water them individually - making sure the soil has a certain moisture and doesn't exceed a certain limit - but I've always had the dream of being able to automate away as much as possible. That's where the idea of `Plantb0t` started. And I want to tell you a little bit about it. + +The basic idea is to have a little controller in each plant-pot that measure the moisture of the soil and reports that back to me via an ESP-12 SOM (System on a Module). The ESP has WiFi capabilities and would log to an MQTT server on my home media server. This way (when I'm at home - none of that IoT shit) I can see how my plans are doing. + +### Current state + +So that's what Revision A of Plantb0t is. I also added a second sensor slot which is meant to be populated by a temperature sensor but could theoretically house a second moisture sensor. In the end the probes are only sticks in the ground that have a resistance between them. + +Here is a dynamic render of the board (that went into prototype production on the 29th of march, 2016). + + + +As you can see it's powered by an ESP-12 and comes with it's own programmer (The lovely CP2102) and micro-USB header. The USB-Port is currently the only way to power the board. + +In the future it is planned to bypass the USB power and only use it for the programmer and otherwise drive everything off an externla powerboard which provides 3.3V for the Plantb0t. + +In the bottom you see two constant current sources that can power two analogue sensors that get multiplexed into the ADC of the ESP-12. + +GPIO pin headers are included for external gismoz such as a pump to act on the moisture data as well as screwholes to mount the whole thing in a 3D printed case. + +In total the board is only 5x5cm big! + +### Future plans + +A few things I want to realise with this project in the next coming weeks: + + - Primarily the Rev A board needs to be tested to make sure that the programmer works + - Figure out a good way to calibrate the sensors. Maybe drive a button via GPIO? + - Design a power board that generates 3.3V for the board (but not the programmer!) from a solar panel and a battery to decouple the entire sensor-board from all power-sockets. + +For the next revision of the board (Rev B) I want to include more sensor slots. Maybe work on the part spacing a bit and increase footprint sizes. It should be easier to solder and someof the parts are ridiculously small. I mean...I have the whole back to work with? + +I also have some crazy ideas for a "Plantb0t+" Version with even MOAR SENSORS (Including a pH-value sensor!). But that's all faaaaar in the future. + +Either way...I'm excited for my boards to get here (hopefully in the next 7-8 days) as well as all the parts I need for the prototypes. + +I leave you with a screenshot from KiCad where you get to see under the hood of the board. Cheers o/ + + + +(The project has a [Github](https://github.com/spacekookie/open_plantb0t) repo where I will try to populate the wiki with as much info as possible)
\ No newline at end of file diff --git a/content/blog/miscellanious/000-newdawn.md b/content/blog/miscellanious/000-newdawn.md new file mode 100755 index 0000000..4acadb7 --- /dev/null +++ b/content/blog/miscellanious/000-newdawn.md @@ -0,0 +1,89 @@ +Title: Static sites vs Wordpress +Category: Blog +Date: 2015-08-14 20:59 +Tags: Dev Diary, Meta + +Regular readers will notice slight differences in my blog from the last time they were here. A lot has changed in the last two years since I started this website. Back then I decided to use Wordpress to host the stuff I wanted to write about because it offered lots of plugins and an easy to use CMS + editor to write articles. But over time I noticed that wordpress, while nice, can be more trouble than it's worth. + +So for the last couple of months I've had a look at different web frameworks. Django, Ruby on Rails and some static site generators like Nikola and now Pelican. The last one is now powering this website. + +The advantages of a static site generator is significantly less server load, simpler design and less overhead with updates and security issues. With no database to hold any kind of data and only static `html` documents being generated at "compile time" and dealt via a very simple html server using exploits or manipulating the website to gain access to my server is almost impossible. + +So...while you can read a lot about why static site generators are cool and what their limitations are, I wanted to use this article to write a little bit about the challenges that I had to deal with porting my old website to a new framework. Because I didn't want to start from scratch. I wanted to keep all my stuff. + +### Creating basic site layout. + +Most of my website are blog posts of different categories and streams. For example, I had one page that displayed all blog posts while I then had other pages that displayed only certain categories. Most static site generators don't really support that. On Pelican I am now using one category for Blogs (Blog) and then have other categories displayed on pages that I statically link in my config: + +```python +MENUITEMS = ( + ('Home', '/'), + ('About Me', '/about-me/'), + ('Blog', '/blog/'), + ('Projects', '/projects/'), + ('LibGDX', '/libgdx-game-of-codes/'), + ('Linux', '/linux/'), + ('Teaching', '/teaching/') +) +``` + +So essentially the menu items link to the category pages that then display articles. By default these pages only displayed a list of posts so I had to modify the category template in my theme. But more about that later. + +Right now I still don't have a work-around for having different categories on the "Blog" page. But my current idea is to not link to a category page but rather a "tag" page. Then give every article that should show up on that page the "blog" tag (or use some voodoo setting that automatically adds tags to articles). + +To get pretty links you can set some options to save pages and posts under different URLs in the config: + +```pytho +nARTICLE_URL = '{category}/{slug}' +ARTICLE_SAVE_AS = '{category}/{slug}/index.html' + +PAGE_URL = '{slug}' +PAGE_SAVE_AS = '{slug}/index.html' + +CATEGORY_URL = '{slug}' +CATEGORY_SAVE_AS = '{slug}/index.html' +``` + +### Theming with [Pelican Themes](http://www.pelicanthemes.com) + +Obviously a website should be something personal. And on my old wordpress site I spent several weeks tweaking the Wordpress Theme to my liking. Static site generators like Nikola or Pelican do offer theming where people much better at writing CSS and html put together something nice. I would recommend cloning a template that you want to use (most of them are on Github) and then modifying it however you like. For example, my template and the modifications I'm making on it can be found here: [github.com/spacekookie/nest](https://github.com/SpaceKookie/nest). + +The first thing I did was tweak the dynamic content filling a bit. I mentioned earlier that I had to modify some stuff to make sure that I didn't just get a list of entries in my blog page but rather either the content or a summary of the page. With a little plugin called "summary" that becomes even nicer but I'm getting ahead of myself. + +```html +{% for article in articles %} + <dt>{{ article.locale_date}}</dt> + <dd> + <a href="{{ SITEURL }}/{{ article.url }}"><h2>{{ article.title }}</h2></a> + <p>{{ article.summary }}</p> + </dd> +{% endfor %} +``` + +As you can see you can embed data from your pelican site into HTML via curly braces, aka Jinja. So the above snippet is obviously a loop that takes an article from articles (which is provided by Pelican in my case) and then renders a "h2" link to the article with the title (`article.title`) and then adds the `article.summary`. + +If you wanted to display the entire content of the post it's as trivial as changing the summary to article.content. That's the beauty of Jinja: it's ridiculously easy :) + +### Next up + +Another thing you might wanna have a look at is the static/css folder of your theme. In the one I use there is a `nest.css` file that contains a lot of modifications to the underlying bootstrap theme. Including changing paddings, colours as well as overriding headers to not have these weird dashes (that look pretty cool for some parts. But not so cool for others). + +But that's all details then. Other things you might want to consider if you move your Wordpress blog to a static site generator is that Wordpress sets up a lot of metadata that then ends up in your Markdown files (if you choose Markdown). Which means that you might want to go through all your articles cleaning out unwanted metadata that might just screw things up. + +I'm using Sublime Text for the multi-cursor/ multi-file edits and regex searching which made editing my article metadata less of a pain in the bum. + +As for this site: I still have a lot of things to work out. For example I still don't have a projects page. Markdown is nice for writing articles but I'm thinking about adding Restructured Text (`.rst`) files for static pages. It's a lot more powerful but also more annoying to write. + +**-EDIT-** + +A quick insertion a few weeks after having created but not yet published this site. + +Alternatively, something I've now started using for my front page is a dedicated template for certain pages. You can set a template via `Template: <template_name>` into a files metadata. Then create a corresponsing `<template_name>.html` in your themes template folder. + +That way I can have special settings for certain pages without having to work with embedded if statements in a sinle html template. + +**-EDIT-** + +But for today that shall be it. I hope you like my new website. Enjoy the new comment system as well (which I just moved to Disqus because that's pretty cool). Until another day. + +~ Kate diff --git a/content/blog/miscellanious/001-lonelyrobot.md b/content/blog/miscellanious/001-lonelyrobot.md new file mode 100755 index 0000000..0da001a --- /dev/null +++ b/content/blog/miscellanious/001-lonelyrobot.md @@ -0,0 +1,45 @@ +Title: Lonely Robot and the future +Category: Blog +Date: 2015-08-25 15:30 +Tags: Dev Diary, Lonely Robot + +Hey everybody, long time no read. + +As I returned from vacation on the Chaos Communication Camp 2015 (Not sure if I'll post more about that) and probably starting a new job next week (*pssst* not sure if I should talk about it ;) ) the rest of my summer is still ahead of me and I'm booming with ideas and inspiration to do stuff. + +I've started more intensively coding on the `newdawn` branch of Reedb, the C port of the database and planning some features for the old codebase via the `backports` branch. Because the new codebase will use a different crypto backend (from OpenSSL to gnu_crypt) a migration agent will be neccesary to migrate between 0.11.x to 0.12+ vaults. But as very few people currently use Reedb and most setups are for testing purposes only that isn't a very big priority right now. Depends on how the current version of reedb develops :) + +But that's talk for another day. What else has been going on? After the Chaos Communication Camp 2015 I've been playing around a bit with my rad1o badge. + + + +But not much has resulted from that yet. The distribution I'm using (Fedora 22) at this time unfortunately has a broken arm-gcc package which means that a linker for embedded systems isn't working properly. So hacking on that will have to wait a little bit. But I will very likely post more stuff about that in the future. + +Now, what was this post supposed to be about? Not Reedb. Or my new job. Or the Rad1o Badge or even the cccamp. It's supposed to be about a new software studio I created. + +### Lonely Robot + +So far we have a website at [lonelyrobot.io](https://www.lonelyrobot.io), an issue tracker at [bugs.lonelyrobot.io](https://bugs.lonelyrobot.io) and are expanding our web prescence but mostly working on projects. + +Two things that we currently have going on are an Android game called **Graviton** (which started out as a tech demo that got out of hand) and, more exciting, LRGE, the `Lonely Robot Game Engine`. + +The whole thing got started between my boyfriend and me who wanted to make video games together. And after a few months of day-dreaming, talking about ideas late at night and bitching about the current state of the gaming industry. But only after a few months of talking we actually started doing something. + +Over the last couple of months we've been working with the LibGDX framework, making some minior and other major modifications to it and writing the specification for an engine. + +We decided to use C++ for it and build it on top of SDL (the Simple DirectMedia Layer) with a very modular design which will allow for modules to be swapped in and out. +While we are still early in the planning phase of the engine it is what we want to focus our efforts on for the next couple of months, possibly the next year. + +While we do make (free) software most of our ideas are for games. Our vision is that with this game engine we will be in a position where we can create them. + +We decided to go for a self-written engine over something like Unreal or Unity because of a multitude of reasons. One of which is that neither of us are very great at blackbox development (that is the development of systems with another system that the developer doesn't fully understand). It is a problem I've always had with game modding but have also run into when playing around with the Unreal Development Kit. + +Even with LibGDX I've always wanted to understand the inner workings of the framework which in the end lead me to modifying large chunks of it. + +So that's that. I wanted to write about it here but will probably move other thoughts about the studio to my Lonely Robot dev blog on [lonelyrobot.io](https://www.lonelyrobot.io/blog). + +That'll be it for now. I have an idea for a different project brewing in my head but I don't want to talk about it for now. All you should know now is: `hardware` :D + +Until another day, + +Kate
\ No newline at end of file diff --git a/content/blog/miscellanious/002-reedb-c-port.md b/content/blog/miscellanious/002-reedb-c-port.md new file mode 100755 index 0000000..5fe627e --- /dev/null +++ b/content/blog/miscellanious/002-reedb-c-port.md @@ -0,0 +1,53 @@ +Title: All aboard, it's a C port +Category: Blog +Date: 2015-10-21 18:02 +Tags: Dev Diary, Reedb + +It's been a long time coming. This blog post, not what I am writing about. Though...what I am writing about has also been a long time coming. So in a way, yes, I guess I was right. + +### Anyways. + +Over a year ago I switched to Linux. I was a Mac fangirl before. I loved the ecosystem, the OS, loved the convenience and the idea of having a system that just *worked* and the power of a root terminal. +But something changed. The garden of bliss grew smaller and smaller and as I realised that I didn't own or understand my computer, that Apple was in charge of what icons I used on my Desktop, I was drawn towards Linux. + +I had used the OS on servers before and even my gaming computer ran Ubuntu to play the 64bit variant of *Kerbal Space Program*. But that last step...that took a bit longer. + +One of the issues I was faced with was compatibility of software. And while most of the things I used (Eclipse, Sublime Text, Spotify, etc.) were also available on Linux, one thing wasn't: my password manager. + +I shall not name it by name because I don't want to advertise a product I no longer want to use. But my password manager was a problem. + +So just over a year ago I set out to write my own password manager. > How hard could it be < I remember myself saying. Oh could I have been more wrong? Probably. But it wasn't easy. + +### The Origin + +Back in the day (and I know it's silly because it's only been a year. But still - a lot of things have changed since then) I knew Java, some Python and wanted to learn Ruby. My brother told me about a mobile framework with which I could easily make a mobile version of the password manager and I was convinced: + +I wanted to write it in Ruby. + +7 months of development, feedback, discussions in a variety of hackerspaces with an even larger variety of people later - Reedb 0.10, the first usable version of what was once a password manager and had migrated into something bigger, something much cooler than I ever thought it would be: a database. + +And as I added more and more features and this database became more and more intelligent I suffered from the limits of Ruby. Speed was terrible, packaging was practically impossible and it became obvious to me that Ruby was a language for the web (not because of the language. But rather because of the people that used it. The rails hipsters and web devs). + +After mucking around with it for at least a month, trying several build systems and desperately trying to get this application to work I had enough. I wanted to port it. + +Only around 3000 lines of code it wouldn't be too difficult to port Reedb into a different langauge. After all, most of the work had gone into the design process, not the actual coding. And while I wrestled with myself and tried a variety of languages, in the end I settled for C. + +With it came a wave of problems. Conventient datastructures that just existed in Ruby such as the Hash (`{}`) or dynamic types made it easy to prototype something and quickly work with large amounts of data. All of that was different in C. And it took me a few months to really start to understand the C ways. + +In the end I made a breakthrough with the design process when I finally discovered unions. And it's been a few weeks since. For now the C port of the project lives on the `newdawn` branch of the [github repo](https://github.com/reepass/reedb/tree/newdawn). The issue tracking has since been migrated to the [Lonely Robot Redmine](https://bugs.lonelyrobot.io/projects/reedb/issues) where you're welcome to fly by and check out the progress. + +### The Future + +I don't know how long it will take for me to finish this port. I'm making good progress, wind is in my favour. But there are still questions to be answered. Especially when it comes to the encryption of things. + +But overall I'm happy with my descision. C is definately different. But it's a good kind of different where you can feel the control you have over your code. The performance is brilliant and a pure C binding makes integrating it into other languages or writing extentions for it as easy as pie. + +I'll wrap this article up for now, it's gotten rather long. I hope that I can post updates about Reedb soon. Plus, I also have some other cool stuff lining up in the hardware section of my mad projects. I still want to do the Omnitool project and I'll definately keep that series alive. But it's a rather large undertaking. And I want to get some experience with smaller projects before I try to do something as mad as that. + it isn't exactly cheap to fuck up a prototype ;) + +--- + +Anyways, I have to sail back into the C... + +Kate + +P.S. Sorry for the bad sailing puns. I promise there won't be any more, for shore. diff --git a/content/blog/miscellanious/003-recovering-a-luks-container.md b/content/blog/miscellanious/003-recovering-a-luks-container.md new file mode 100755 index 0000000..5cb6b29 --- /dev/null +++ b/content/blog/miscellanious/003-recovering-a-luks-container.md @@ -0,0 +1,59 @@ +Title: Recovering a destroyed LUKs container +Category: Blog +Date: 2015-11-19 11:41 +Tags: Dev Diary + +So...funny thing happened to me the other day. And by funny I mean not funny. Actually I mean quite the oposite of funny. I booted my computer after a normal night of sleep (after I had actually shut down my laptop after several weeks of activity) and...nothing. + +I stared at my plymouth boot screen while nothing prompted me to type in my passphrase to decrypt my harddrive and the first thought through my mind was: + +> Fuck...I don't have backup. + +### How to debug + +Now...not to worry, after some time I was dropped into a recovery console where I could ask very simple questions like what kernel modules were present and what Systemd had been up to. And at first I thought the problem was clear: `Module failed to load: vboxdrv` and other messages populated my screen – all about VirtualBox kernel modules. + +So the problem was clear. I had fucked up something when installing a new kernel or VirtualBox or anything else. So I blacklisted the modules and moved on...just...that it didn't. The problem persisted. Thinking that I had fucked something up when dealing with the GRUB config or the GRUB recovery console I got my trusty Fedora 22 live-USB out and booted off that. + +### How not to panic + +To the realise that my 256GB SSD was only 500MB full (which was rightfully detected as an `ext4` formatted volume. The rest of my drive was marked as `unpartitioned space`. \jawdrop. + +Now...here is where things get and got interesting. But first let's have a look at my setup. + +``` +sda (the actual drive) +├── sda1 (ext4, mounted as /boot, contains my kernel) +└── sda2 (LUKS Encrypted Volume, contains subvolumes) + ├── vc-root (RootFS) + ├── vc-home (HomeFS) + └── vc-swap (guess c:) +``` + +So as you can see my boot drive is outside the LUKS container and unencrypted which was why I even got the chance to enter a recovery console. The rest of my system is encrypted. And seeing that only sda1 was being picked up it meant that the partition table on my disk must have had been destroyed to the point that it no longer knew sda2. + +Knowing this didn't help very much though and it took me a few hours to fix this. + +### Restoring the Partition Table + +So the main problem was that my partition table was broken. I don't want to start speculating as to why this happened. Maybe my SSD just lost a few blocks, maybe it was bombarded by solar radiation or maybe (just maybe) I was obducted by aliens in the night, refused to give out my master passphrase in my sleep and because of frustration of not being able to get to my data they deleted some junks from my partition table just to spite me. + +Either way, a combination of two applications saved my life and hopefully will save yours. + +`testdisk` and `cfdisk` + +At first, make sure you have backups ;) And don't blame me if you fuck it up. Also you need to know EXACTLY what your layout is to restore this. Otherwise BAD THINGS WILL HAPPEN *waves hand around warning-ly* + +Run `testdisk` on your drive, enter through the screens, let it do a deep search and just say yes to everything it wants to do. This restored the LUKS header for me again at which point my computer at least started seeing the encryption container again. Didn't mean I could log in because keyfiles couldn't be found (they're not in the header apparently). + +After that, I ran `cfdisk`. What this program does (or can do) is rebuild your partition table. After letting testdisk have it's go it found my LUKS header and completely destroyed my ext4 bootpartition. So in my case this is what it looked like. + + +What you will want to do is hit NEW, select the correct size of your partitions. Depending on how running testdisk went for you it might have found different parititions, all of them or none. Please! For the love of god, make sure you get your sectors right. Becase if you don't it will seriously damage your system and might make it completely unusable. +In my caseit was easy, I filled in my boot partition, marked it as bootable and set it's type correctly, also fixed the type error where before sda2 was being picked up as an LVM and not a LUKS container (this is obviously from my running system). And this is what I ended up with. + + +Make sure you write your changes, exit and reboot. And if you did everything right, you will have a working system again. +And that's that. I hope this article will be of use to someone at some point. And remember: make backups! + +Cheers o/
\ No newline at end of file diff --git a/content/blog/miscellanious/004-getting-started-with-xmmpp.md b/content/blog/miscellanious/004-getting-started-with-xmmpp.md new file mode 100755 index 0000000..edbc829 --- /dev/null +++ b/content/blog/miscellanious/004-getting-started-with-xmmpp.md @@ -0,0 +1,91 @@ +Title: Getting started with XMPP/ Jabber +Category: Blog +Date: 2015-11-24 12:14 +Tags: Dev Diary + +So after having spoken to a friend the other day and trying to get him to start using XMPP (aka as Jabber) instead of facebook messenger I realised that even while I thought it was trivial to set up other people might disagree with me. So here a little guide :) + +Now...this isn't just a step-by-step instruction of what to do. In fact this article is more about getting you to understand XMPP than registered with a specific server. XMPP (formerly known as Jabber, just so you know why some people use the terms interchangably) is a chat protocol, not a chat service. It is based on XML and was originally created for near instantanious message delivery (chats). However since then it has been extended to also be able to VoIP and video (more or less good, that all depends on your client). +So XMPP is a protocol that anyone can just use. However...when I say "get started with XMPP" I don't mean set up your own servers and chat system. I mean Jabber, which is still the name of a chat service. + + +### A network instead of a server + +The current open Jabber infrastructure is built around a bunch of servers (actually quite a **lot** of servers) that can communicate with each other. While inside the network it doesn't matter what server someone is registered with. As long as both people are part of the network they can chat with each other. And that's that. (Cryptographically and version wise it becomes a bit more complicated than that. But for the end user, that's what it boils down to). + +There is a list of servers in the Jabber network (also called directory) available [here](https://xmpp.net/directory.php). As you can see there are quite a few servers out there that will allow you to register. Now...when picking a server please make note of a few things. + + - Check the software has had updates in at least the last year. You don't want to trust your private chats to outdated software, especially because that will usually mean that the server admin can't be bothered to update to newer versions of plugins and protocols. + - Check that the server passes both "Server to Server" and "Client to Client" security tests. (Both in the green). + - You like the domain. You don't want to have a domain "@kinkymotherfucker.com" if you don't like it :D + + +### Register with a server + +So let's asume you've found a server you like. Scolling through the list I would probably register at [blah.im](https://blah.im). Note that you will have to import an SSL certificate. You will have to if you don't have the CA [Cert Root certificate installed](https://www.google.com/search?q=What+is+CA+Cert&ie=utf-8&oe=utf-8#q=What+is+CACert). + +But you will also notice that the server doesn't actually have anything on it's website. To register on servers in a lot of cases you will need a jabber client to do it for you. I am using Pidgin and will thus also demonstrate it with that client. Pidgin is free open source software and runs on almost any platform. But feel free to use a different client if you find one you like more. The features should all just be transferable. + +To install Pidgin please go to their website and follow download and installation instructions for your platform. For mine (Fedora) it's as simple as typing `dnf install pidgin`. I will assume you managed to install it and we +move on :) + +In Pidgin navigate to accounts and Manage your accounts. + + + +In the opening window click on **add** and then select XMPP from the list of possible accounts to add. +Fill in your desired username, the server you want to register with and a passphrase. You can leave the resource blank. Also make sure you tick the box "Create this new Account on the Server". + +Servers provide different ways to register. Some just have a registration webpage, some have an API that pidgin can talk to. Some make pidgin open a browser window and guide you to their registration site. This is something unique to the server you choose to register on. + +In the case of the *blah.im* server pidgin opens a new website where I can register my nickname (which I will not do because I already have an account I like to use). Check your input with the example picture below. + + + +And that's that. You should be registered and ready to log in and chat with other people who also use Jabber/ XMPP, no matter what server they're on. + + +### Encryption via Jabber (OTR) + +Jabber by itself can be secured via SSL and several transport layer security measures but that makes it no more secure than any other service. The server provider can still read all messages and log them without you ever knowing it. + +Because of that a lot of people use separate encryption with Jabber called "Off the Record", short "OTR". + +What OTR does is encrypt messages on your computer, sends them to your friend and then locally on their computer decrypts them again. This has however two drawbacks. + + 1. Both you and your friend need to be online to chat with each other over OTR. You can't send them an offline message and let the server cache it until they come back online to read it. + 2. OTR does not support multiple devices. That means you can't start chatting on your PC, have to leave and pick up the conversation on your phone. You will need to start a new conversation. And a lot of mobile clients don't properly support OTR because they shut down the session when you lock your screen. + +To address both these issues there is a new crypto protocol called "Axolotl" which fixes both of these issues. Axolotl is however a generic protocol and can be used with literally anything. To adapt it to XMPP and integrate it into the already existing infrastructure of servers there is a second protocol called "OMEMO" which implements Axolotl for XMPP. It is however still very new and *very* few clients support it at this time. In fact, the only Jabber client I know of is **Conversations** on Android. + +But let's assume the downsides of OTR don't bother you (they don't bother most people). How would you go about using it? OTR in Pidgin is a plugin that needs to be enabled. Depending on what platform you install it to you might have to install the plugin yourself which can be more or less work. (On Fedora it's just `dnf install pidgin-otr`) + +But [you can figure that out yourself, I hope.](http://lmgtfy.com/?q=Install+Pidgin+OTR+plugin). + +*Waits for you to install the plugin* + +Good, now what needs to happen. First you need to active the plugin and generate yourself a key. Go to **Tools** and then **Plugins**, search for the OTR plugin and enable it. Then go to it's configuration page. + +<img class="dual" src="/images/jabber/pidgin3.png" align="left"><img class="dual" src="/images/jabber/pidgin4.png" align="right"> + +You will need to generate a key. A key in this case means a private key, if you're already somewhat familiar with cryptographic concepts. It's a key that is unique to you, should be protected, private and *never* shared with anyone. It is thus called your **private key**. + +When clicking the button to generate a key Pidgin will make one for you and save it somewhere on your filesystem. It allows you to encrypt and decrypt data (chats, files, etc.) that people send to you. +Afterwards a key fingerprint will show up and the generate button will be greyed out. + +A key fingerprint is sort of a signature. It can identify you as you. So if someone sees your fingerprint they can be sure they're talking to the right person (if they've verified the fingerprint via another medium, e.g. meeting in person). But the fingerprint doesn't expose any secure information about your key. + +You can also change some basic information about how OTR should work on your system. I won't go over these for now. + + +And that's it. You're done. You can initiate new private conversations with people via the **OTR** submenu in the chat screen. And know that everything you say to the person in that session is secure. And here is the best thing: OTR provides something known as "forward secrecy". That means that if at some point someone steals your laptop or phone and you loose your private key that doesn't mean that, even if someone logged every single piece of encryted text going over the network between you and a certain person and has all the information needed to theoretically decrypt your messages, they can't! + +Because while you chat with OTR the key continously changes. So if you ever loose your key, you don't have to worry about old chats becoming public or visible for others to see. + +(As long as you don't log them in cleartext of course). + + + +#### Happy chattin' + +~ Kate
\ No newline at end of file diff --git a/content/blog/miscellanious/005-getting-started-with-reedb.md b/content/blog/miscellanious/005-getting-started-with-reedb.md new file mode 100755 index 0000000..ac7824c --- /dev/null +++ b/content/blog/miscellanious/005-getting-started-with-reedb.md @@ -0,0 +1,127 @@ +Title: Hacking on Reedb +Category: Blog +Date: 2016-03-14 10:43 +Tags: Dev Diary, Reedb + +So...it's been a while :) Exams are over, code has been written, bugs have been fixed, frustrations have been had. Terrible christmas gifts have been sold off on ebay and found a new owner with a misguided sense of style. I've also gone a bit mad with one of my other projects: The Christmas bauble. As you might recall it started as a harmless joke to learn KiCAD, ended up actually being manufactured (I never saw that bonus from dirtypcb for mentioning them a lot :c) and has now gone into planning phase for Revision B. + + + +But more on that later. I'm back, in the spring with new energy and drive. To talk to you about Reedb (yet again). + +With `0.12` coming closer and closer to being a reality I wanted to quickly draft up something how to interact with Reedb. The API is basically stable at this point and while the C-binding isn't quite done the C++ interface is ready to be used (and almost actually hooked up :) ). + + +### Initialising a context + +Getting started with reedb requires a context which holds a bunch of information about what vaults exist, what tokens haven been scoped, users active, watchdogs, etc. etc. + +In addition to that there are vault interfaces that get attached to a context that can then actually interact with vaults. This way different vaults can get handled by different interfaces that are completely separated from each other. + +```C++ +reedb *rdb = new reedb(); +rdb->set_os(LINUX); +rdb->set_distro(SYSTEM_D); +rdb->set_verbose(true); +rdb->finalise(); +``` + +The OS and sitro flags determine what configuration paths and formats are specified as well as how to launch reedb at system startup (if such a behaviour is wanted/ set up). + +After defining all the parameters required or wanted to initialise the Reedb context call finalise to make it official and make the context usable. Before `finalise()` is called, trying to access other functions via the context will result in an error being thrown. + +### Vault interfaces + +So after having a Reedb context you have to register a vaults interface to it. Multiple interfaces can be registered and separated which means that certain vaults can be accessed that require different settings (for example a minimum passphrase length). Generally it just offers more flexibility to the developers. + +```C++ +rdb_vaults *v = new rdb_vaults(); +rdb->register_vinterface(v); + +vault_meta meta = v->create("fancy_vault", "~/Documents/", "MyD0gisnot!mypassword!"); // P.S. I don't have a dog :) +``` + +The create function will generate a key, encrypt the Master key with the provided passphrase and dump it to disk. In addition a folder structure and configuration is written. The config is mostly future proofing - none of the values are actually currently used. But it will hold information about zones, users and cipher modes in the future. + +--- + +After creating a vault you still need to authenticate on it. The unencrypted key might still be held in RAM (in secure memory that is) but just because you created a vault doesn't automaticaly mean you have access to it. So after calling `create` you need to call: + +```C++ +// A token is malloced for you in secmem. Do not free it yourself. Let Reedb do it for you! +rdb_token *token = v->authenticate(meta.id, "MyD0gisnot!mypassword!"); +``` + +You need the UUID from the interface we are addressing the vault via - we can find the UUID in the vault_meta we were handed during creation. Alternatively we can ask the vaults interface. + +From the docs: +> A UUID is provided from the management wrapper and isn't stored in the vault itself. A vault doesn't care about its own ID, nor does it even know it has one. +> +> Do not try to hard-code UUIDs into your program as they might be non-persistent across runtimes. + +Authentication only takes the ID and passphrase at the moment. However a user-auth function will be added in at least the next version. Both return a token that will be required for **every** operation that follows. + +And that's it...you can now interact with your shiny new Reedb Vault :) + +```C++ +std::string file_id = "Reedb.org"; +map<std::string*, std::string*> content(); +content["Username"] = "Peter Pan"; +content["Passphrase"] = "flower123"; + +/* Then take all that data and insert it */ +v->insert(meta.id, token, &file_id, &content); // Takes the pointer to a content map to save memory during inserts. +``` + +As you can see you need a vault-id and a token to even be allowed to the next step. Then to insert a piece of data you need to give it a name. Reedb is object-oriented which means that every dataset has a name and is an "object" on the FS ( Blockdevice mode is in planning :) ). So from that day on your piece of data will be available if you query for "Reedb.org". + +```C++ +map<std::string*, file_meta*> data; +data = query_file(meta.id, token, "Reedb.org"); +``` + +That will put a query return into your map. A query return isn't quite data. It's basically a name of a data-set mapped to it's head. A file head contains a bunch of metadata that isn't exactly deemed "important". Like it's name, a category, some tags and whatever else you might want to save in there. +In fact you can extend header fields at will. + +```C++ +map<std::string*, std::string*> meta_delta(); +// ... +v->migrate_headers(&meta_delta); +``` + +From the docs (again): + +> A meta_delta is the name of a meta-field that should be inserted mapped to its type in a std::map<?,?>. +> If a meta should be removed set the type to "-1". +> +> When removing meta fields from active vaults data needs to be migrated via rdb_meta_migr(...). Also be aware that removing active meta fields can cause terrible memory corruption. Be warned! + +A file_meta is exactly that: a vault header. It can be further searched and filtered with RQL (Reedb Query Language) that we will not go into further in this blog post. Just know that it exists :) + +*hint hint* `"$CATEGORY: [Social | Website | Online] $TAGS:[Private & Friends] $NAME: ~[Face]"` :) + +Deleting, updating files and updating vaults is analogue to what we already saw. Basically you always keep your vault ID and token on you, then provide the interface with some data. + +Some of the steps might seem a bit verbose but that's just so that the user (aka developer) gets maximum control over what she is doing with her code. It also allows for more precice error handling - narrowing down the source of the error further for the end-user. + +### A tiny last thing + +There are two interfaces for Reedb. A C++ and a C one. And you pick which one you want to use by either doing + +```C++ +#include<reedb/core.hpp> +``` + +or +```C +#include<reedb/core.h> +``` + +The C Interface is pretty much analogue to the C++ one (with obvious slight differences). + +```C +vault_meta *meta; +rdb_vaults *vaults = rdb->create(&meta, ...); +``` + +That's it for today. I hope this article gave you a quick introduction to the native interface and makes you at least a little curious or excited to work with it :)
\ No newline at end of file diff --git a/content/blog/miscellanious/006-another-blog-update.md b/content/blog/miscellanious/006-another-blog-update.md new file mode 100644 index 0000000..d1e75a4 --- /dev/null +++ b/content/blog/miscellanious/006-another-blog-update.md @@ -0,0 +1,27 @@ +Title: Winter update +Category: Blog +Tags: Dev Diary, Meta +Date: 2016-12-2 10:43 + +Howdy everybody! + +As the year is winding down and we're all getting ready for the jump to take us out of what has (in my opinion) been a *very* shitty year, I looked at my blog and could only shake my head. + +I had moved this over from Wordpress to Pelican and basically replicated all of the layouts to the extent that some of Pelicans own functionality had to be abused to make it work. But as I kept publishing things on here I realised that most of the features I had implemented went unused. + +And so, for the last few days I have tweaked the layout (and design - as some might notice) to be a bit more traditional again. + +I was also considering to change theme but after not finding anything I liked I decided to hack the fuck out of my current one instead. You can check out all of my horrible changes [here](https://github.com/spacekookie/nest). + +I've also finally done some stuff that I've wanted to do for ages - such as pimping up the front page, adding a proper projects page and go through some of my old tutorial series, fix their formatting (yea right "perfect wordpress import...") and update them to newer API's of libraries. Some articles have just been dropped because I would have had to re-work their formatting and they were no longer relevant. Stuff will slowly be introduced again, with proper formatting :) + + +### Everything else + +In the terms of literally everything except my blog: I'm looking forward to the **33C3**. I'll be joining with the c-base assembly. My first congress in almost a decade! Expect maybe an update from that. And maybe there might be some christmas hacking. It's always more fun to do silly RGB LED stuff if it ends up annoying people on the tree! + +Also, with the blog now in a bit better shape I will try to keep a closer journal of what I'm doing. But hey...no promises, right? ;) + +I shall leave you with this piece of relaxing GIF. + +<img class="padded" src="http://i.imgur.com/KZquOZM.gif" align="center">
\ No newline at end of file diff --git a/content/blog/miscellanious/007-post-congress-2017.md b/content/blog/miscellanious/007-post-congress-2017.md new file mode 100644 index 0000000..fd951ff --- /dev/null +++ b/content/blog/miscellanious/007-post-congress-2017.md @@ -0,0 +1,67 @@ +Title: Post 33C3, what next? +Category: Blog +Tags: Dev Diary, Congress, CCC, Hamburg +Date: 2017-01-03 12:28 + +Howdy everybody, + +I just came back from the annual hacker conference in Hamburg, Germany known as the "Chaos Communication Congress" (or CCC for short). It was the first time I was there for the entire venue and the first time I was able to go at all since *2008*. So yay! + +It was a lot of fun and I have a lot of nice memories to hold onto now. I talked to a lot of interesting people, learned new things, got inspired to do new things and continue on old things. + +More importantly, I loved the chance to get in touch with some other women in the tech industry (via Haecksen & Queer Feminist Geeks), talk about problems, attempt to come up with solutions and just generally rant about things :) + +I also found out that I am in no way, shape or form a dancing person. Although electronic club music is fun! + +## Some talks I went to + +Following is a non-comprehensive list of the talks I went to. I am filling this from memory, so some talks might have been missed or dropped. And maybe I'll just edit them in later without anyone ever knowing. + +<br/> + +**[How Do I Crack Satellite and Cable Pay TV?](https://fahrplan.events.ccc.de/congress/2016/Fahrplan/events/8127.html)** + +A really quite epic lecture about using glitching to extract keys from a very dated security layout. Not that anyone should do this (it's not worth doing it anyways...never anything good on) but it will teach you a lot of stuff about hardware security + +**[Bootstraping a slightly more secure laptop](https://fahrplan.events.ccc.de/congress/2016/Fahrplan/events/8314.html)** + +A talk about the flip-side of TAILS which aims to introduce trusted computing into a world where the machine can't be trusted. HEADS on the other hand uses coreboot and cleverness to create a verifiable machine environment to build an OS on top of. Made me want to get an old thinkpad on ebay to play with :) + +**[The Nibbletronic](https://fahrplan.events.ccc.de/congress/2016/Fahrplan/events/7925.html)** + +A relatively short talk about the creation of a musical instrument. Learning by doing and failing. Quite interesting for me as a hardware designer (as a hobbyist) but also a musician. + +**[Shut Up and Take My Money!](https://fahrplan.events.ccc.de/congress/2016/Fahrplan/events/7969.html)** + +If you have a bank account with N26...stop having a bank account with N26. Their security is absolutely horrible. And while, yes, all of these security issues have been fixed, it shows a rather lacking attitude towards security from their engineering team. Best demonstration of client-side security gone wrong. And why ReST APIs are fucking aweful! + +**[Untrusting the CPU](https://fahrplan.events.ccc.de/congress/2016/Fahrplan/events/8014.html)** + +This was a great talk given by a close friend of mine about one of his super crazy projects. The idea being to construct an FPGA powered PCI-E device for laptops and/ or desktop computers that intercepts messages to the display, encodes and decodes text into them to provide an interface for encrypted messages without using the CPU. It's really quite interesting and I can't wait to see what he does with it. + +**[Making Technology Inclusive Through Papercraft and Sound](https://fahrplan.events.ccc.de/congress/2016/Fahrplan/events/7975.html)** + +One of my favourite talks was about an engineering toy kit that was aiming to be more inclusive. The problem it attempts to tackle are the incredible low numbers of women in computer science and engineering (significantly lower than in other scientific fields). There are a lot of reasons why women aren't well represented in the fields and they are all cultural. This talk was about trying to change the culture around teaching people about electronics and code to be more inclusive towards groups of people (mostly girls/ women) who would otherwise be missed. + +I really enjoyed the talk on a lot of different levels. One was the technical aspect of creating a childrens toy on the cheap that is inclusive and universally programmable through audio encoding. Quite worth a watch. + +I don't think that just with projects like this the culture around women in tech will change. But it's a start. What we realistically need is a change in culture throughout all layers of society. I think the problems around women in tech are quite complicated. And unfortunately usually result in a bunch of assholes starting to shout either about how feminism is evil or how diversity isn't important. And biases aren't actually thaaaaat bad, right? */s* + +I could rant here forever and it's questionable how many people would actually care :) I can recommend this talk. Let's leave it at that :) + +**[The Moon and European Space Exploration](https://fahrplan.events.ccc.de/congress/2016/Fahrplan/events/8406.html) and [Interplanetary Colonization](https://fahrplan.events.ccc.de/congress/2016/Fahrplan/events/7942.html)** + +Those were just the first two talks from a series of space talks. The first one was from one of the heads of ESA about their plans to colonise the moon for profit! And science of course... It was quite funny and definately worth watching. + +The second one I almost liked more, though mostly the first part of it. Liz George manages to explain incredibly well in a very short amount of time what challenges exist when discovering exo-planets. The second part (by somebody else) is a bit more vague about how to actually get there and is less science, more fiction. But hey :P + + +## Going into 2017 + +So in short: 33C3 was pretty epic! And I honestly can't wait for next year. It's not clear yet where it will be held but it will be epic non-the-less. And who knows, maybe I have a talk to hold by then :) + +Which brings me to this year. Last year was fucking shitty. Politically...On a personal level it actually went quite well. And I got a lot of shit done. I did Google Summer of Code, I made *huge* progress on my game project (yes, I will post about that at some point). And especially in the last months of the year, I redesigned and rerouted the Open Plantb0t board. On january 1st, 2017 the revision A2 design went into production. + +I hope to get all my parts together soon and build up a second prototype series which (hopefully) works better than the last ;) I will keep y'all updated on that. + +Until then, I hope you've had a happy new years eve and not an all too terrible year...yet ;)
\ No newline at end of file diff --git a/content/blog/miscellanious/008-libgdx-super-ui.md b/content/blog/miscellanious/008-libgdx-super-ui.md new file mode 100644 index 0000000..c86499d --- /dev/null +++ b/content/blog/miscellanious/008-libgdx-super-ui.md @@ -0,0 +1,116 @@ +Title: LibGDX UI utility: Super UI +Category: Blog +Tags: Dev Diary, LibGDX, Game Dev, Lonely Robot +Date: 2017-01-24 00:14 + +**Let me tell you a factual statement** + +*UI programming is terrible* + +**Let me tell you an even more factual statement** + +*UI programming in LibGDX is even more terrible* + +I am a big fan of LibGDX. It's a really nifty library/ framework to get started with game development if you're more comfortable inside a code editor than a full blown game engine that is more targeted towards designers and artists. And I put my money where my mouth is: I have a series about LibGDX development for beginners on this blog and work almost exclusively with it when it comes to my own projects. + +Yet, there is something that bothers me and there didn't seem to be a great solution to fix it. UI code structure. In this post I want to highlight a utility I have written for LibGDX which is very easily embeddable into your existing projects which will you help structure UI code more efficiently. + +## The root problem + +The reason I dislike UI programming with LibGDX is that it usually results in very long code files or passing dozens of parameters into sub-classes that are needed to update the UI for button presses, etc. + +This goes so far that I have written an editor for game assets before just to realise that (once the development was complete) it had become completely unmaintainable and I had to start from scratch with better structure. It is incredibly easy to just throw out a UI design with Scene2D and LibGDX but unfortunately it is equally easy to produce very bad code which will turn into a big spaghetti mess. + +Let's look at an example problem that I wanted to solve. + + + +Looking at this structure we have three main components that interact with each other. We have a class that handles UI logic (setting up actors in tables, adding listeners, etc), we have a window state which in the particular case which made me write an alternative was a "Lobby Handle" which coordinated what players were going to enter a match, the map, game mode and if everybody in the multiplayer match was set to "Ready". Lastly we have the actual network signal handlers that listen to TCP/ UDP packets and execute code to write/ read from the window state as well as update UI elements. + +Implementing this structure with Scene2D and LibGDX will result in a lot of very ugly code. Because the network signals need to know everything about the UI (how it is structured, etc). And our window state can be written to by two different sources which means that we need to mutex it to avoid race conditions. + +So, what was I trying to solve? First a bit of limitation of scope. Because a lot of UI problems have been solved over and over again and usually at the cost of runtime performance or with a *lot* of extra code. + +1. UI code doesn't have to be embedded in a screen +2. All UI code can access the shared context of the screen +3. UI elements can update each other +4. Clean API that can be called on from anywhere (with a reference to the handle) that triggers range of functions. + +So with that in mind, this is what I did. + +```java + +class MyUIHandle extands UIHandle { + public static enum UI implements UI_BASE { + PLAYER_LIST; + } + + { /** Initialiser block for new objects */ + + registerHandle(new PlayerList(), UI.PLAYER_LIST); + // ... more handles + } + + @Override + public void initialise(Stage s, Object ... var) { ... } + + public class PlayerList extends UIContainer { + + @Override + public void initialise(Stage s) { ... } + + // Define more API here ... + } + +} + +``` + +When we initialise a new `UIHandle` the initialiser block will create our `PlayerLists` and register them with the `UIHandle`. That code is hidden away from you. You can see that we're implementing a different enum type that we overload with values so that we can address submodules via a compile-time checkable value (such as enums). From inside (and outside) this class `UIContainer's` are available via `handle.get(UI.SUB_HANDLE)`. Obviously keeping your enum labels short will make your function calls snappier :) + +The following graphic will sort-of explain the layout in more detail. + + + +What you might also notice is that the `UIHandle` has an initialise function with variadic parameters while the `UIContainer` class only takes a stage. That is because window context is stored once in the `UIHandle` and then accessable from all `UIContainer` classes. This way we only need to do the inversion of control pattern once instead of for every sub-component. + +You can keep the `UIContainer` classes outside this code-file. Then you might however want to provide a construct that does another inversion of control so that an external `UIContainer` can access the context provided via initialise! + +```java + +public class PlayerList extends UIContainer { + + private MyUIHandle parent; + public PlayerList(MyUIHandle parent) { this.parent = parent; } + + // ... +} + +``` + +Now let's talk about that public API. In our original example we wanted to have networking code update some UI elements. And we want UI elements to update other UI elements. So first of all, we keep context in each `UIContainer` about what UI elements are accessable to it. So what we can do in every of our submodules is this: + +```java + parent.get(UI.PLAYER_LIST).updatePlayers(playerList); +``` + +It also means that if we get new data from – say – a network socket or AI simulation, we can very easily update data in some random UI element. + +```java + handle.get(UI.PLAYER_LIST).populate(playerList); +``` + +So all in all, we have solved the following problems: + +1. We have access to all game state in the UI code without passing too many parameters into lots of sub-classes +2. UI code can be moved into lots of files for easier understandability +3. Context isn't duplicated +4. UI code can update other UI code without needing a direct reference to it. + +The individual `UIContainer` instances are essentially independant of each other via dependency injection. + +This library isn't done yet. Most of this is kinda hacked together to fit into **my** game. But I'm interested in making it more generic and putting it on Github. Especially because I can see myself using it again in the future. + +Hope this might be useful to somebody out there. If you have questions, comments, hatemail... + +[Twitter](https://twitter.com/spacekookie) or [E-Mail](mailto:kookie@spacekookie.de)
\ No newline at end of file diff --git a/content/blog/miscellanious/009-moonscript-adventures.md b/content/blog/miscellanious/009-moonscript-adventures.md new file mode 100644 index 0000000..d991a89 --- /dev/null +++ b/content/blog/miscellanious/009-moonscript-adventures.md @@ -0,0 +1,60 @@ +Title: Dabbling with Moonscript +Category: Blog +Tags: Dev Diary, moonscript, programming +Date: 2017-05-06 11:55 + + + +Recently I've started learning/ using Moonscript. It's a language that compiles to [lua](https://www.lua.org/) and as such can run in the LuaJIT, an alternative lua engine which allows very easy and *fast* ffi calls into native code. This makes lua code capable of writing very performant applications and games that use native rendering, window creation or general libraries. + +But in my opinion lua has always felt a bit cumbersome. I use awesomewm so I had to write it occasionally to customise my UI layout. And this is where Moonscript comes in. It's a lot of syntactic sugar on top of lua as well as some other concepts such as object orientation which lua just plain out doesn't have. And while yes, you can write good code without OO (*cough* **C** *cough*) it is a nice tool to have in your pocket, especially when writing GUI applications or games. + + +## The language + +```Moonscript +class Thing + name: "unknown" + +class Person extends Thing + say_name: => print "Hello, I am #{@name}!" + +with Person! + .name = "MoonScript" + \say_name! +``` + +As you can see Moonscript is an indentation based language which (in my opinion) combines syntactic elements from lua and ruby together. In the snippet above (which is from the [moonscript website](http://moonscript.org/)) you can see classes, inheritance as well as the `with` keyword which allows you to initialise/ work with objects without typing it's variable name over and over again. + +If you want to learn more about the language, I can only recommend you have a look at the [Moonscript in 15 minutes guide](https://github.com/leafo/moonscript/wiki/Learn-MoonScript-in-15-Minutes) + + +## How to use it + +You can just write Moonscript files, add `#!/usr/bin/env moon` to them and get going. Obviously that's pretty cool for little scripts that you just want to get going. But not so great for larger applications because a) you don't have access to `ffi` via luaJIT and b) it adds additional startup cost. + +So instead for my projects so far (which so far are a [game](https://github.com/spacekookie/dinodino) and a desktop app) I use a `Makefile` to build and run the Moonscript compiler and then execute the `init.lua` with luajit. + +```Makefile +SOURCES := $(wildcard *.moon) $(wildcard **/*.moon) +LUAOUT := $(SOURCES:.moon=.lua)0 + +.PHONY: all run build + +all: run +build: $(LUAOUT) +%.lua: %.moon + moonc $< +run: build + luajit init.lua +``` + +## Wrapping up + +So...I'm kinda excited about this. Most of the code I write is either in C or Java (depending on what exactly I'm doing). And those two strongly typed and compiled languages have served me well and will continue to be my go-to solutions for a lot of problems. + +But I've long been looking for a dynamicly typed, interpreted/ just-in-time compiled language that I can use for anything from little scripts to medium-sized desktop applications. I used to use python for this but have recently (over the last 6-9 months) fallen out of love and developed a rather passionate dislike of it and it's ecosystem. + +My current project will get it's own little article at some point but I don't mind teasing the progress here. I'm writing a new UI for redshift which works with X11 linux backends and is heavily inspired by f.lux on MacOS. It's written in moonscript, with my own forked version of redshift (which I call [libredshift](https://github.com/spacekookie/libredshift)). It's on [github](https://github.com/spacekookie/redshift_ctrl) and licensed under MIT. + +Hope I've made you a little curious about Moonscript. And stay tuned for updates on future projects with it :)
\ No newline at end of file diff --git a/content/blog/summerofcode/gsoc-000-i-got-accepted.md b/content/blog/summerofcode/gsoc-000-i-got-accepted.md new file mode 100755 index 0000000..894bd85 --- /dev/null +++ b/content/blog/summerofcode/gsoc-000-i-got-accepted.md @@ -0,0 +1,25 @@ +Title: I got accepted to GSoC 2016 +Category: Blog +Date: 2016-04-27 18:47 +Tags: GSoC2016 + + + +The title should be self explanatory about that one :) + +But let me go back a little bit. A couple of weeks ago I sat in the basement of my local hackerspace talking to a friend about crypto when somebody joined the conversation, asking if I was a student and if I might be interested in Google Summer of Code. + +After I looked up the project and familiarised myself with what had to be done, I thought it would be interesting to try to apply. And so I did. I wrote a long-ish proposal of what I wanted to do, how I would do it and when exactly I would acomplish my goals. (You can read my original proposal [here](https://storage.googleapis.com/summerofcode-prod.appspot.com/gsoc/core_project/doc/1458924075_GSOCProposal-KatharinaSabel.pdf?Expires=1461863360&GoogleAccessId=summerofcode-prod%40appspot.gserviceaccount.com&Signature=h0y5Nzi7llFNWKzt9%2BLGLvxcAPZ%2FaO7ni1ZyRDA3uFi6PD%2BDBmtIB6RJAr4Ulhv6fe64IFyB%2FI9iuVIYWIInYTmN7pZ9aUxw6TgxgFYguIywfcE2yUZ4o5UKb0PUbwI0Pu7o6mq%2BzSDXqlegpVOgujQ9k2QuTg1T1CqGzSi%2FnC4u6H0mB%2BxzWGGpoBC6rFwkKM1S70gE7hJ0EZpgYWr9H9zKPcwrfPtx99zqb488sH6STGYJf4tFrDRnnr57k2zbSN%2BO17chZtVBjGUYrKoyU6B%2FGB8MexFE6rmYaTCr5AjgqGWm97VCCwZkpHbRiTtFH5yT825G9%2FkRPYHkxsPnCw%3D%3D)) + +In the meantime I actually had a sit-down with my mentor (the person joining the conversation in that basement) and made further plans how to implement things. + +And so this is it. The next month or so I will have time to get to know the code base of the project (although I partially already have), meet more people from the community and generally get into the rythm of what GSoC is. + +I will be posting three blog posts on the official [Freifunk Blog](http://blog.freifunk.net/), one in a couple of days/ weeks, one in the height of the project and one that will go into the aftermath of the project. + +But in the meantime I will be keeping my blog up to date about what I am doing, how things are going, my challenges and things I learn. +In the hopes that people might find it useful and lean things from it. Or just to save my insane ramblings in some narcissistic pleasure...to think that I am relevant in the world :P + +Read you soon, + +Kate
\ No newline at end of file diff --git a/content/blog/summerofcode/gsoc-001-prepping-the-patient.md b/content/blog/summerofcode/gsoc-001-prepping-the-patient.md new file mode 100755 index 0000000..46fd034 --- /dev/null +++ b/content/blog/summerofcode/gsoc-001-prepping-the-patient.md @@ -0,0 +1,37 @@ +Title: First steps...baby steps +Category: Blog +Date: 2016-06-02 19:56 +Tags: GSoC2016 + +So it's been almost two months, the community bonding period has passed, blog posts were written, talks held and slowly but surely I'm working myself into the qaul.net codebase. + +It's always weird joining a larger project and seeing established build setups, code conventions or generally things where your first thought is "I would have done that differently...". But it's really fun. + +I'm currently working myself into [mbed.tls](https://tls.mbed.org/) which is the crypto library which was chosen to power the cryptographic backend for libqaul (which powers qaul.net). + +That includes some code that will probably not make it into a later version of my branch: the debugger. + +### The De-bugger?! + + + +Well...debuger might be a bit of a strong word, it's basically a way to develop core functions of qaul.net without having to start a GUI, going through NetworkManager dialup or oslr bootup. + +There I am currently busy writing a wrapper around a new namespace added to libqaul: `qcry` (short for qaul crypto) and properly integrate all the mbed.tls sources into the library so they can be accessed by libqaul. The idea being that I don't have to leave vim and the terminal to develop on the core cryptographic components such as: + + - Key generation + - Identify generation (with private key fingerprints) + - Identity verification + - ??? + +Only in the last step of the last bulletin do I actually have to involve the GUI of qaul.net. And until that point I wish to not come in contact with it (if avoidable). + +So most of next week will be getting to know mbed-tls as I have never worked with it before. But hey...can't be worse than the gcrypt documentation¹ :') + +Hope to read you soon with more updates (probably rants). + +Kate o/ + +--- + +¹I am sure I will eat my words in 4 weeks diff --git a/content/blog/summerofcode/gsoc-002-final-evaluation.md b/content/blog/summerofcode/gsoc-002-final-evaluation.md new file mode 100644 index 0000000..6c8a4e4 --- /dev/null +++ b/content/blog/summerofcode/gsoc-002-final-evaluation.md @@ -0,0 +1,69 @@ +Title: What I have done in GSoC 2016 +Category: Blog +Date: 2016-08-19 18:13 +Tags: GSoC2016 + +Google Summer of Code is coming to an end. And as the final bugs are getting squashed and more code is being prepared for the big merge, I am sitting here, trying to think of how to represent my work. + +I thought I would write up a little blog post, explaining what I've done and what still remains to be done. + +### The TLDR + +My main contributions are all available [here](https://github.com/spacekookie/qaul.net/commits/qaul_crypto?author=spacekookie) (spacekookie/qaul.net on the `qaul_crypto` branch). I did a lot of small commits. Most of my code can be found in this [sub-directory](https://github.com/spacekookie/qaul.net/tree/qaul_crypto/src/libqaul/crypto). + +In addition to that I ported an existing project (from python) to C to be relevant for future front-end endevours of the client. It's called [librobohash](https://github.com/spacekookie/librobohash). I didn't end up finishing the port because there were more pressing issues in qaul.net and the UI was delayed. + +While most of my work has been in hidden backend systems there is a demo you can run. The source compiles and has been tested under Linux (Ubuntu 16.04 and Fedora 24) and is located under the `src/client/dbg/` directory. The demo creates two new users (to simulate communication between two nodes), adds the public keys to the keystore and then continues to sign and verify messages. If the demo returns lots of "0" and "OK" it went okay :) + +Feel free to play with the demo; for example, switch out `message` for `fakemessage` during verification :) The source for the demo can be found under `src/libqaul/qcry_wrapper.c` + +### The good (aka what I have done) + +<img class="dual" src="/images/gsoc/02_cryptoui.png" align="left"> + +The two main components that I've written during GSoC2016 are internally referenced as `qcry_arbit` and `qcry_context`. They are two modules that make up the new crypto module in qaul.net. + +As I explained in my first blog post on the [Freifunk blog](http://blog.freifunk.net/2016/gsoc2016-wrapping-crypto-module-qaulnet) the Arbiter provides a static API for the rest of the library (libqaul) to interact with the crypto module. + +The context holds the actual magic of holding user keys, signing and verifying messages and (theoretically) encrypting messages as well. + +Possible with this API at this time is to create users, to sign messages with a users private key and to verify messages that are sent to you from other users. Originally it was planned to split the arbiter into the actual API and a dispatcher which would allow for concurrent access to the inner functions. However it was established through tests that the design was overkill and was thus scrapped. + +A keystore was added in addition to the user store already existing in qaul.net to provide an easy way to store public keys (mapped against fingerprints) that are received from flood events on the network. + +In total the crypto submodule adds another ~2.2k lines of code to the project. + + +### The bad (aka what I haven't yet done) + +So far completely un-implemented is encryption. Unfortunately working with the crypto library selected for the task turned out to be more challenging than expected. With almost no documentation and a few very niche examples I basically went through the library line-by-line to understand how it worked. + +As such, my focus was set on signature exchanges at first because the verifiability of messages and the change to address users by their fingerprints was deemed more important. + +My contributions to qaul.net won't end with the end of Summer of Code. The function stubs are already provided and I plan on implementing the encryption features in the coming weeks. + + +### The ugly (aka what I can't do yet) + +Signatures (and also encryption) of private messages (so messages that aren't flooded to everybody) is currently impossible. This is due to the way that the communication system in qaul.net works. + +I have talked to my mentor and he said that they were currently in the process of re-writing the communication sub-system in libqaul. This means two things: + + 1. I need to wait for those changes to be done until I can finish what I set out to do + 2. Some of the code I wrote (hooking into the current communication system) is being made obsolete :( + + +### In conclusion + +What I can say is this: qaul.net has gotten a very big step closer to becoming a more secure network of communication. The crypto submodule is tested and easy to use. What might happen is that parts of the code get merged (the crypto submodule itself) without merging any of the code that hooks into the communication stack. + +I had a lot of fun working on this project and I am looking forward to more contributions. I have a few cool ideas that I want to discuss with the rest of the team and I am glad that I participated in the Google Summer of Code. + +I was interested in open source before and I contributed to my own projects on github. But the experience I gained this summer will be helpful for me, not just for my own work, but to be less reluctant to join other developer communities. + +And I look forward to seeing my code get merged into qaul.net :) + +Read you soon, + + +~Kate
\ No newline at end of file diff --git a/content/downloads/cuckoo_hashing.pdf b/content/downloads/cuckoo_hashing.pdf Binary files differnew file mode 100644 index 0000000..df63737 --- /dev/null +++ b/content/downloads/cuckoo_hashing.pdf diff --git a/content/downloads/gameofcodes/artpack1.zip b/content/downloads/gameofcodes/artpack1.zip Binary files differnew file mode 100644 index 0000000..29c24a1 --- /dev/null +++ b/content/downloads/gameofcodes/artpack1.zip diff --git a/content/images/banner_bg2x.png b/content/images/banner_bg2x.png Binary files differnew file mode 100644 index 0000000..c536792 --- /dev/null +++ b/content/images/banner_bg2x.png diff --git a/content/images/banners/plantb0t_revA.png b/content/images/banners/plantb0t_revA.png Binary files differnew file mode 100755 index 0000000..ec17f03 --- /dev/null +++ b/content/images/banners/plantb0t_revA.png diff --git a/content/images/cf_disk.png b/content/images/cf_disk.png Binary files differnew file mode 100755 index 0000000..7c01b05 --- /dev/null +++ b/content/images/cf_disk.png diff --git a/content/images/cf_disk1.png b/content/images/cf_disk1.png Binary files differnew file mode 100755 index 0000000..da69860 --- /dev/null +++ b/content/images/cf_disk1.png diff --git a/content/images/christmas_bauble_pcb.jpg b/content/images/christmas_bauble_pcb.jpg Binary files differnew file mode 100755 index 0000000..4602f08 --- /dev/null +++ b/content/images/christmas_bauble_pcb.jpg diff --git a/content/images/christmas_bauble_pcb.png b/content/images/christmas_bauble_pcb.png Binary files differnew file mode 100755 index 0000000..8e67eca --- /dev/null +++ b/content/images/christmas_bauble_pcb.png diff --git a/content/images/christmas_bauble_render.png b/content/images/christmas_bauble_render.png Binary files differnew file mode 100755 index 0000000..3096dce --- /dev/null +++ b/content/images/christmas_bauble_render.png diff --git a/content/images/example.png b/content/images/example.png Binary files differnew file mode 100755 index 0000000..40307f1 --- /dev/null +++ b/content/images/example.png diff --git a/content/images/favicon.ico b/content/images/favicon.ico Binary files differnew file mode 100755 index 0000000..2e10718 --- /dev/null +++ b/content/images/favicon.ico diff --git a/content/images/flora_pinout.png b/content/images/flora_pinout.png Binary files differnew file mode 100755 index 0000000..e7a038b --- /dev/null +++ b/content/images/flora_pinout.png diff --git a/content/images/flora_withleds.jpg b/content/images/flora_withleds.jpg Binary files differnew file mode 100755 index 0000000..da708b3 --- /dev/null +++ b/content/images/flora_withleds.jpg diff --git a/content/images/front_matrix_background.png b/content/images/front_matrix_background.png Binary files differnew file mode 100755 index 0000000..5059491 --- /dev/null +++ b/content/images/front_matrix_background.png diff --git a/content/images/gameofcodes/series01/01_setup_ui.png b/content/images/gameofcodes/series01/01_setup_ui.png Binary files differnew file mode 100644 index 0000000..5449046 --- /dev/null +++ b/content/images/gameofcodes/series01/01_setup_ui.png diff --git a/content/images/gameofcodes/series01/02_setup_ui.png b/content/images/gameofcodes/series01/02_setup_ui.png Binary files differnew file mode 100644 index 0000000..39be1e0 --- /dev/null +++ b/content/images/gameofcodes/series01/02_setup_ui.png diff --git a/content/images/gameofcodes/series01/04_eclipse.png b/content/images/gameofcodes/series01/04_eclipse.png Binary files differnew file mode 100644 index 0000000..620cf1b --- /dev/null +++ b/content/images/gameofcodes/series01/04_eclipse.png diff --git a/content/images/gameofcodes/series01/05_eclipse.png b/content/images/gameofcodes/series01/05_eclipse.png Binary files differnew file mode 100644 index 0000000..9c13065 --- /dev/null +++ b/content/images/gameofcodes/series01/05_eclipse.png diff --git a/content/images/gameofcodes/series01/06_eclipse.png b/content/images/gameofcodes/series01/06_eclipse.png Binary files differnew file mode 100644 index 0000000..50ad0ce --- /dev/null +++ b/content/images/gameofcodes/series01/06_eclipse.png diff --git a/content/images/gameofcodes/series01/07_gamechange.png b/content/images/gameofcodes/series01/07_gamechange.png Binary files differnew file mode 100644 index 0000000..c35e21e --- /dev/null +++ b/content/images/gameofcodes/series01/07_gamechange.png diff --git a/content/images/gameofcodes/series02/01_framelife.png b/content/images/gameofcodes/series02/01_framelife.png Binary files differnew file mode 100644 index 0000000..da9b9a9 --- /dev/null +++ b/content/images/gameofcodes/series02/01_framelife.png diff --git a/content/images/gameofcodes/series02/02_createclass.png b/content/images/gameofcodes/series02/02_createclass.png Binary files differnew file mode 100644 index 0000000..58f5725 --- /dev/null +++ b/content/images/gameofcodes/series02/02_createclass.png diff --git a/content/images/gameofcodes/series03/01_badrotation.gif b/content/images/gameofcodes/series03/01_badrotation.gif Binary files differnew file mode 100644 index 0000000..7a5b609 --- /dev/null +++ b/content/images/gameofcodes/series03/01_badrotation.gif diff --git a/content/images/gameofcodes/series03/02_rotating.gif b/content/images/gameofcodes/series03/02_rotating.gif Binary files differnew file mode 100644 index 0000000..8fff569 --- /dev/null +++ b/content/images/gameofcodes/series03/02_rotating.gif diff --git a/content/images/gameofcodes/series04/01_800x600.png b/content/images/gameofcodes/series04/01_800x600.png Binary files differnew file mode 100644 index 0000000..db76878 --- /dev/null +++ b/content/images/gameofcodes/series04/01_800x600.png diff --git a/content/images/gameofcodes/series04/02_720p.png b/content/images/gameofcodes/series04/02_720p.png Binary files differnew file mode 100644 index 0000000..c4567d6 --- /dev/null +++ b/content/images/gameofcodes/series04/02_720p.png diff --git a/content/images/gameofcodes/series04/03_1080p.png b/content/images/gameofcodes/series04/03_1080p.png Binary files differnew file mode 100644 index 0000000..41d68aa --- /dev/null +++ b/content/images/gameofcodes/series04/03_1080p.png diff --git a/content/images/gameofcodes/series04/04_1440p.png b/content/images/gameofcodes/series04/04_1440p.png Binary files differnew file mode 100644 index 0000000..2fba5dc --- /dev/null +++ b/content/images/gameofcodes/series04/04_1440p.png diff --git a/content/images/gsoc/00_acceptance.png b/content/images/gsoc/00_acceptance.png Binary files differnew file mode 100755 index 0000000..a201efa --- /dev/null +++ b/content/images/gsoc/00_acceptance.png diff --git a/content/images/gsoc/01_debugger.png b/content/images/gsoc/01_debugger.png Binary files differnew file mode 100755 index 0000000..13af522 --- /dev/null +++ b/content/images/gsoc/01_debugger.png diff --git a/content/images/gsoc/02_cryptoui.png b/content/images/gsoc/02_cryptoui.png Binary files differnew file mode 100644 index 0000000..c75580b --- /dev/null +++ b/content/images/gsoc/02_cryptoui.png diff --git a/content/images/jabber/pidgin1.png b/content/images/jabber/pidgin1.png Binary files differnew file mode 100755 index 0000000..65b9086 --- /dev/null +++ b/content/images/jabber/pidgin1.png diff --git a/content/images/jabber/pidgin2.png b/content/images/jabber/pidgin2.png Binary files differnew file mode 100755 index 0000000..458a911 --- /dev/null +++ b/content/images/jabber/pidgin2.png diff --git a/content/images/jabber/pidgin3.png b/content/images/jabber/pidgin3.png Binary files differnew file mode 100755 index 0000000..a56384a --- /dev/null +++ b/content/images/jabber/pidgin3.png diff --git a/content/images/jabber/pidgin4.png b/content/images/jabber/pidgin4.png Binary files differnew file mode 100755 index 0000000..896b76d --- /dev/null +++ b/content/images/jabber/pidgin4.png diff --git a/content/images/jabber/pidgin5.png b/content/images/jabber/pidgin5.png Binary files differnew file mode 100755 index 0000000..9b4e04e --- /dev/null +++ b/content/images/jabber/pidgin5.png diff --git a/content/images/jabber/pidgin6.png b/content/images/jabber/pidgin6.png Binary files differnew file mode 100755 index 0000000..355ee25 --- /dev/null +++ b/content/images/jabber/pidgin6.png diff --git a/content/images/libgdx_ui/01_base_problem.png b/content/images/libgdx_ui/01_base_problem.png Binary files differnew file mode 100644 index 0000000..19b7152 --- /dev/null +++ b/content/images/libgdx_ui/01_base_problem.png diff --git a/content/images/libgdx_ui/02_ui_structure.png b/content/images/libgdx_ui/02_ui_structure.png Binary files differnew file mode 100644 index 0000000..128d318 --- /dev/null +++ b/content/images/libgdx_ui/02_ui_structure.png diff --git a/content/images/logo3.png b/content/images/logo3.png Binary files differnew file mode 100755 index 0000000..f7d5659 --- /dev/null +++ b/content/images/logo3.png diff --git a/content/images/lua_moon_banner.jpg b/content/images/lua_moon_banner.jpg Binary files differnew file mode 100644 index 0000000..2b0bcf5 --- /dev/null +++ b/content/images/lua_moon_banner.jpg diff --git a/content/images/lua_moon_banner.png b/content/images/lua_moon_banner.png Binary files differnew file mode 100644 index 0000000..6764e73 --- /dev/null +++ b/content/images/lua_moon_banner.png diff --git a/content/images/omnitool_background.jpg b/content/images/omnitool_background.jpg Binary files differnew file mode 100755 index 0000000..6a0c91d --- /dev/null +++ b/content/images/omnitool_background.jpg diff --git a/content/images/omnitool_background2.jpg b/content/images/omnitool_background2.jpg Binary files differnew file mode 100755 index 0000000..7b14433 --- /dev/null +++ b/content/images/omnitool_background2.jpg diff --git a/content/images/plantb0t_RevA_front.png b/content/images/plantb0t_RevA_front.png Binary files differnew file mode 100755 index 0000000..6344d38 --- /dev/null +++ b/content/images/plantb0t_RevA_front.png diff --git a/content/images/plantb0t_RevA_naked.png b/content/images/plantb0t_RevA_naked.png Binary files differnew file mode 100755 index 0000000..0178c41 --- /dev/null +++ b/content/images/plantb0t_RevA_naked.png diff --git a/content/images/rad1o_badge.png b/content/images/rad1o_badge.png Binary files differnew file mode 100755 index 0000000..44b3bc6 --- /dev/null +++ b/content/images/rad1o_badge.png diff --git a/content/images/rdb_article_banner.png b/content/images/rdb_article_banner.png Binary files differnew file mode 100755 index 0000000..2d2f85b --- /dev/null +++ b/content/images/rdb_article_banner.png diff --git a/content/images/reedb_banner.png b/content/images/reedb_banner.png Binary files differnew file mode 100755 index 0000000..87bfe32 --- /dev/null +++ b/content/images/reedb_banner.png diff --git a/content/images/silly_no_visitors_blog.png b/content/images/silly_no_visitors_blog.png new file mode 100755 index 0000000..e69de29 --- /dev/null +++ b/content/images/silly_no_visitors_blog.png diff --git a/content/images/ws_2812b_single.png b/content/images/ws_2812b_single.png Binary files differnew file mode 100755 index 0000000..9fb6bb7 --- /dev/null +++ b/content/images/ws_2812b_single.png diff --git a/content/kookie.txt b/content/kookie.txt new file mode 100644 index 0000000..bfc5db0 --- /dev/null +++ b/content/kookie.txt @@ -0,0 +1,112 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + + ❤ (rayya) ~> cat msg +Following are my public gpg key as well as Threema Fingerprint and others. + +Threema +======= +ID: 77WYDHA2 +Fingerprint: AB2A 4F8A 8FF9 6335 75C2 4E0C 175B C0D6 + +Public Key Cryptograpy (GnuPG) +============================== + +Plain copy of my key can be found here +https://spacekookie.de/pgp/6FE1BBF3.asc + +It is also available on the MIT keyserver. + +This document was last changed/ signed at around + ❤ (rayya) ~> date +Sun 7 May 14:09:59 CEST 2017 + ❤ (rayya) ~> gpg2 --fingerprint 6FE1BBF3 +pub rsa4096 2017-02-02 [SC] [expires: 2019-02-02] + 9F18 A093 CF65 F938 E4C8 EFA4 29E0 5751 6FE1 BBF3 +uid [ultimate] spacekookie c-base <spacekookie@c-base.org> +uid [ultimate] spacekookie (Using computers to create weird random patterns...) <kookie@spacekookie.de> +sub rsa4096 2017-02-02 [E] [expires: 2019-02-02] + + ❤ (rayya) ~> gpg2 --armor --export 6FE1BBF3 +- -----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFiTCvcBEADHjyVbz7g3OBehkRxyfCBQY5MIBl45YINzVSO5wneNi5OgUs0F +7XVRlgv43iOIk77pC0DyfnODkEQ2r+uxsnFAtgBcULDrEwsNa/npGiV3byHohAQW +ELMB/yJu6A6ZkVp2MQmKanieSfgS8FNe7Dmc728uTu0pbQjpXVwfgqbDAuKeGPX7 +ANSy448FNqS3UDhwmnqMFG1Q0BraimqBHDbzpKvqUSmpNwxo92gGJdupZHzgZzfr +KaekzKbcWN98AI7qTedc2c21uOVA5sLH3ue01Ql34/ScalPGMWJghdbQRCFqkQ2B +AeSvKWvd9BCi/stDVnoQ6v5MlyEQIKd1N4VeZ2aNwNSHcc79hP0T1WCsoemfK+jt +L+DtjpDm3cLhraHEF9VKrKGtaUBrYdkLM/E6y65lRCMP0Sav3tdb5aqB5ZdeJkzA +AbAWFkXpbNWlLOQuhWKJhmgs8j5XMzsJU92Z/X7VlAN+yRGKyARBDVKKjpKiH4Ml +Wp58kaSp9wNSHunTUMANAvsVpcF/RtXPyXxs24KdzkMtuwQKKNbV5P+dUFOq7efq +/oFru3uij6NznV5KpczwtlO9RAKgzg8g9FQMEv+xpRN+00QzAfB8wTAwdCw9bFSA +577TEhV57bKW1so4IdrfNHOD6nxInH0iLSagFt+5/PyW5CGv95E7//8lGwARAQAB +tFhzcGFjZWtvb2tpZSAoVXNpbmcgY29tcHV0ZXJzIHRvIGNyZWF0ZSB3ZWlyZCBy +YW5kb20gcGF0dGVybnMuLi4pIDxrb29raWVAc3BhY2Vrb29raWUuZGU+iQJUBBMB +CAA+FiEEnxigk89l+TjkyO+kKeBXUW/hu/MFAliTCvcCGwMFCQPCZwAFCwkIBwIG +FQgJCgsCBBYCAwECHgECF4AACgkQKeBXUW/hu/OTcw/8CFUEn7Zpkbax54Ie4LF6 +uvtoKNhdoSCoh6fk404X1MPaGA0P0t4psRNQGVhCUXDPosMGre2ljWOApPBtutlD +cbVhicqdfiXHyIXudhwV54zj+XoRfNg32sWOrm7Kewo8AiCxEbscJ1o8RBoEGp2Y +KIXV4/6Ngh43Ok9VQr6rakvHVeSlUyo84CFrqOk88mzFuvuG6zzU1+ilGVGs8tlu +Q0K2Cmt+3yq9pFch3uwoGKE0w6lO+CI6vh4jqgNq8kNVBw3V0JTgZogOeuoZD1Rd +JGCBLkVR41qvhR0Es6COgTaS6dlRAcRO0e1KmZxzWepAgkm+HtmWAfF03zyCGYu5 +MnVX6wMo8vSfSaor0KfjyqUiJ6nWjYCQ874AW8wqQAmJ8HXdRcnXazzbXBdB8Mpy +bLhn2wM7dDYBG8lRjWssMDOyqsqtkw9/Fm2LCDaonBD5VN7vg8aWt2MOdrjSSnT3 +5uH5d+fCLALCVcl6TFvWXia3KcKLfBUR3XfT0gHaGo/fBe2SGt/LYNWj3Ww95W/7 +6Ftz6D6Pzlq0AEvdpuBzx+h4EAiTTC5GDWhgyq3GO1o76ty4wXUL6/r4jk0Htec0 +Y9vfCcS+jD3Z9wprglUB98UWUpPlBbwQ/5ukgN+AjMqR1m56SUb0L6ePEAGNTB1L +xn4ufMGOAvUoQ19QYGVoMqK0K3NwYWNla29va2llIGMtYmFzZSA8c3BhY2Vrb29r +aWVAYy1iYXNlLm9yZz6JAlQEEwEIAD4WIQSfGKCTz2X5OOTI76Qp4FdRb+G78wUC +WJMMCQIbAwUJA8JnAAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRAp4FdRb+G7 +89woD/wPKuieSmCj/PH+7JfUB7l+J+VtDdLGoDCziLmZPTCasPOcaIqHuxN4Xa4/ +SNCauVuRf0XMjh1slcUqK0yfV4HcSJSMw5kMk/DYIlz9cNsntjaHrgmD9HxZNHd/ +6Y+VpPMaYhoubJs18yir+kGcSANJUb03BS9YdYj1Oua0YhPis7/wehTVACehc0ZT +wntYSwn/U/KXEsUQzOgO0dij54f5MrS9VFBoXmQLJKMPSja3Mj70+mBIrsyQqnaK ++nja9NoMO1ExZHqgpXhkiEnTYEhFi20olRhuxbMPrtLcmLkLlYJ5tOQ59pM3BmYh +aYDH2/wqT8m9mfXeLJ3NFJxibGCnmPlpfc3/rCLuz/bljI9D2OX4MfH8HZcX39tO +rOgCaAExztCV6dIprmksy/4QHXTgkguxIveAQEuZscNdCcCZ3OgVCBcynuVIS5gw +kylHs8odvym3X2EAH8iAK2XtNrnTBUvSaRHei6/PgGnyFwIapRIQqeuiGw4v0Y8H +KphzOEMDULA0SRg7yaiNQIU4OYUeazhbkYAuQvyr3Qh7BFZJO4Vh1uNXtvspm+u+ +K2mFHBFMFPCdafZSjDHqgDhdIk6vOQGchOPEk4tc9vOBi8oynWmPpRHtrE0sVNCm +8pecsSkTJlODKtx7gyBUdbzhbZuDp3NcLna8oH/Y193QlLWe5bkCDQRYkwr3ARAA +wiTra2jJpDOd+EIWFKp1Rc9zoFXKL8/sWQp5348kjept+h9TAuy6FXXoUksFxWuz +R3N5meL04YxAMzjLMu6V9zeAGIpnc29LJG1GAnVGmZwsqh9xWctvyRU0ha/OIsWH +DD5uvXaEjwNCiAYIYjZTBTQZYCoCn8LEgOp/U1bYH4FbB9SUMNVWw4Df2qnmza3Z +MW51auCjVjHiXxhgJjMvsgFHXY4wJlmUPCNf7h5fjopzbWl5eT6aW99r5wnd3anM +MHQoCvY9+/jynSdIh/YLwZD46QTl25zLAq8zvc/zLQUrseaI0IBrU9RY9JAaJ2i0 +2PrOcoJ6VisD7a08n/1AfULrt6qTzZAetRU7uY2/hNv8Qfk+a7uIQ6J5IjT6Porf +1k2iIjbBJPUrE9nv+5eJhip/B061lsab2uRYmDTjNo03mvT7+kCc0ueMQHdJkt7r +YG1mMSAbXcXr3ayaShUTqK6ZA+62xrGTdIBV7bJ/i3r++CK6OTO3svQrSAw5kP5T +1/tofXJaXc8YAyD4AZgjEbmJ6nKPDVuiyZH6RWrqgWAXddO3w4RuMEkEcAUyG8Ow +sy7yAGKl3Pv1iSd2rNzewBVRb/igJx0Pi/TGmfAJ7YXT6wfMZAayBnGYtn2kS9i4 +JQiyJee1afpmaoYjOC2zpfMcpKauyoqDo2rHE/GbzvMAEQEAAYkCPAQYAQgAJhYh +BJ8YoJPPZfk45MjvpCngV1Fv4bvzBQJYkwr3AhsMBQkDwmcAAAoJECngV1Fv4bvz +ktkP/2JJRdF/yW+OR0Njo+ZTGhBVNaaOzfhi2VQu+XbpDS8ymdJqmL0v7i+wGZ/D +hTwLTmRMQBYopEm5jU+HGBTbAwu0LF3r7ecUDx+7QUqw/u7rZco/IZws26wxhbyZ +pMWLm3iIffzkpQJ9mz3Y4HUFozV6tq5fr1NCt/cF/AknzUDzvZTif7wOAeiCh9Ad +fKf4w3sxig/7Vx4Up8qfCE4W0momjF7yS0DQxgz4O483eSUZ2dvazqYP7a9FBYfM +JmXLD2hfM5a7uGrBvnaUDODWPnWpcvySzAvsg/aw3ckbg6NGe4h3VnnzLy/u9DI9 +qtCTTCyKIfjixTN+Lxd7YyG6/G0C68moy45MRpxiuZldwDk6JDLHe8B7581V8WlJ +gBX+LwFjzcKAE0FkkXX5MbBM8sGn48phRlLc43VD+oOgIB5P6cbprbOrQ9Y/mQty +0Qvxdy7AzJGFrnZo+UMHc2JOuWBHcMvJcWGbppCpalpgmNjXTkDg0JzzhSj84nay +MLuEoA6FuF/Zo5PBvGOtFViLb3MMnsndZfjlm4QrRrWiLxYvdnqG4elFMJuVWsYA +J3ydeRpI7N3tQg6XA+pPiAeSn6evBR19n/W6h8dZN6vvFG4vlvUdm8P+dGhhxTB1 +Oc0zZg7qrYqTQnCZxPB0AltH8ZUCq2iBGFMS5UYBidPdw3e5 +=vSgE +- -----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEnxigk89l+TjkyO+kKeBXUW/hu/MFAlkPFaQACgkQKeBXUW/h +u/NbgQ/+LRikzv8yFpVzbNZTg1mEQ+wFDZEnrwSDvdEL/+iqZ8X8V3NWz9svUIF/ +mMjQeYH3XcZqJ19XpyfSd+1MiFoNRCU04aaOwopmWrok0qYoKW7zdwTHmiBnftCs +vctvO5o0INN2Qfrhwjzot2EfBiuo6LBG3lV6rWdMZFkJFlzoCqlFrMVWBAYBtXlN +QhPgxfanp3Fg7hKGS5sYjtGlGEY6Qu1nkbU/92sHtCnSb+2TM8fRij4Su/5B+XMH +e2UbmMcSY2iS2tn46sG0hAVky5+BF2JHKWVOECrszqVwxDRhqPBdVOKD3biXrQsM +9NistBGaFoYcVxN7wvhVdOd07pqc6HV1Dmv3ngro6kX3j9KsB/70OvKntsVWbnph +kEwoOVAhPs8f6zNo/lGhs9vYsLgkbSpzflKYlEqHlOFOPSGzHAAeM7eMi6aWVMWB +LnVxaKtogE1m7lPdgkHt0V6sqHUFf+j7eHrWp0J8w514FcO9dhhNiY0Yvn1xJCBM +tEkemLyMfk8gx3M1lz8p7RkKR601GcXi6mtpetREPL40zUt8IhRDwUwXM6Pvuspl +pKUxhkbE8CeJ9vvyqVhoAjTfEGDpXI6sb53le7RXkw8JdQ9ueoJyt4Fk/zXXxvdC +3XMB6dIEFQ979IHp04Pb8njdWEokzNOMlUPyrTR0UvYXUPeDmhs= +=ZvDg +-----END PGP SIGNATURE----- diff --git a/content/pages/aboutme.md b/content/pages/aboutme.md new file mode 100755 index 0000000..ec91d79 --- /dev/null +++ b/content/pages/aboutme.md @@ -0,0 +1,21 @@ +Title: whoami +Slug: about + +```scala + ❤ (idenna) ~> whoami +spacekookie +``` + +I'm a computer science student from Berlin, Germany. In my free time I make games, write free and open-source software and am an allround nerd. + +I grew up in a small town in West Germany in the mid 90's. As a girl I loved technology, played around with electronics and copied bad BASIC game code from books. I wanted to become an inventor and designer. + +Through my teenage years that changed. While I was still interested in technology, I got deeply into story writing, music and 3D modelling/ animation. All of that I wanted to one day put together and make games. + +In my early 20's I started studying engineering, then later computer science. Though interested in chip design, my passion for video games had made me attempt to create one; and become obsessed with programming. I learned to code in Java, later in python, Ruby, C. I fell in love with free software and linux. Since then, I've tried to expand my knowledge on all things technology, trying not to loose touch too much with my artistic side. + +I write too much C code, try to contribute to open source projects, try to make games. This blog is to be a journal of how projects are going, showcases of finished projects (yea right..."finished") and off-topic thoughts about whatever comes to mind. + +I hope that you find any of this stuff even remotely useful. If so, yay! If you want to get in touch with me, the easiest way is probably my [twitter](https://twitter.com/spacekookie) or e-mail me at [kookie@spacekookie.de](mailto:kookie@spacekookie.de). You can find my GnuPG public key [here](/kookie.txt). + +I also implement a 512mg Prime MTU according to the [RFC2549](https://tools.ietf.org/html/rfc2549).
\ No newline at end of file diff --git a/content/pages/home.md b/content/pages/home.md new file mode 100755 index 0000000..7fbb47a --- /dev/null +++ b/content/pages/home.md @@ -0,0 +1,9 @@ +Title: Fun memory violations +Subtitle: NULL +URL: / +Save_As: index.html +Template: home + +Hi! Welcome to my dusty internet hangout place. + +My name is <b>Katharina Fey</b> and I'm a software developer from Berlin. I like taking photos, writing stories and starting way too many personal projects.
\ No newline at end of file diff --git a/content/pages/showcase.md b/content/pages/showcase.md new file mode 100644 index 0000000..5a371f7 --- /dev/null +++ b/content/pages/showcase.md @@ -0,0 +1,6 @@ +Title: Notable errors +Slug: showcase + +My goal has always been to make things. Sometimes by myself, sometimes with others. I start many things that will never be done due to my own perfectionism. But some things might be worth highlighting. Things that could be useful to others. Or are still actively being developed for support. Or are just plain beautiful. + +**Consider this my extended CV...** diff --git a/content/pages/teaching.md b/content/pages/teaching.md new file mode 100755 index 0000000..8c424ee --- /dev/null +++ b/content/pages/teaching.md @@ -0,0 +1,6 @@ +Title: Tutorials +Slug: guides + +I started writing a few tutorials on my blog. But in order for you to find them easier I created this static page that will link you to the respective blog posts. Check out the dropdown menu above or icons below to view the available tutorials and courses. + +TODO: Add links to list pages here
\ No newline at end of file diff --git a/content/pgp/kookie.txt b/content/pgp/kookie.txt new file mode 100644 index 0000000..0a38055 --- /dev/null +++ b/content/pgp/kookie.txt @@ -0,0 +1,114 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + + ❤ (idenna) ~/pgp> cat msg +Following are my public gpg key as well as Threema Fingerprint and others. + +Threema +======= +ID: 77WYDHA2 +Fingerprint: AB2A 4F8A 8FF9 6335 75C2 4E0C 175B C0D6 + +Public Key Cryptograpy (GnuPG) +============================== + +Plain copy of my key can be found here +https://spacekookie.de/pgp/6FE1BBF3.asc + +It is also available on the MIT keyserver. + +This document was last changed/ signed at around + + ❤ (idenna) ~/pgp> date +Thu 2 Feb 11:52:00 CET 2017 + + ❤ (idenna) ~/pgp> gpg2 --fingerprint 6FE1BBF3 +pub rsa4096 2017-02-02 [SC] [expires: 2019-02-02] + 9F18 A093 CF65 F938 E4C8 EFA4 29E0 5751 6FE1 BBF3 +uid [ultimate] spacekookie c-base <spacekookie@c-base.org> +uid [ultimate] spacekookie (Using computers to create weird random patterns...) <kookie@spacekookie.de> +sub rsa4096 2017-02-02 [E] [expires: 2019-02-02] + + ❤ (idenna) ~/pgp> gpg2 --armor --export 6FE1BBF3 +- -----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFiTCvcBEADHjyVbz7g3OBehkRxyfCBQY5MIBl45YINzVSO5wneNi5OgUs0F +7XVRlgv43iOIk77pC0DyfnODkEQ2r+uxsnFAtgBcULDrEwsNa/npGiV3byHohAQW +ELMB/yJu6A6ZkVp2MQmKanieSfgS8FNe7Dmc728uTu0pbQjpXVwfgqbDAuKeGPX7 +ANSy448FNqS3UDhwmnqMFG1Q0BraimqBHDbzpKvqUSmpNwxo92gGJdupZHzgZzfr +KaekzKbcWN98AI7qTedc2c21uOVA5sLH3ue01Ql34/ScalPGMWJghdbQRCFqkQ2B +AeSvKWvd9BCi/stDVnoQ6v5MlyEQIKd1N4VeZ2aNwNSHcc79hP0T1WCsoemfK+jt +L+DtjpDm3cLhraHEF9VKrKGtaUBrYdkLM/E6y65lRCMP0Sav3tdb5aqB5ZdeJkzA +AbAWFkXpbNWlLOQuhWKJhmgs8j5XMzsJU92Z/X7VlAN+yRGKyARBDVKKjpKiH4Ml +Wp58kaSp9wNSHunTUMANAvsVpcF/RtXPyXxs24KdzkMtuwQKKNbV5P+dUFOq7efq +/oFru3uij6NznV5KpczwtlO9RAKgzg8g9FQMEv+xpRN+00QzAfB8wTAwdCw9bFSA +577TEhV57bKW1so4IdrfNHOD6nxInH0iLSagFt+5/PyW5CGv95E7//8lGwARAQAB +tFhzcGFjZWtvb2tpZSAoVXNpbmcgY29tcHV0ZXJzIHRvIGNyZWF0ZSB3ZWlyZCBy +YW5kb20gcGF0dGVybnMuLi4pIDxrb29raWVAc3BhY2Vrb29raWUuZGU+iQJUBBMB +CAA+FiEEnxigk89l+TjkyO+kKeBXUW/hu/MFAliTCvcCGwMFCQPCZwAFCwkIBwIG +FQgJCgsCBBYCAwECHgECF4AACgkQKeBXUW/hu/OTcw/8CFUEn7Zpkbax54Ie4LF6 +uvtoKNhdoSCoh6fk404X1MPaGA0P0t4psRNQGVhCUXDPosMGre2ljWOApPBtutlD +cbVhicqdfiXHyIXudhwV54zj+XoRfNg32sWOrm7Kewo8AiCxEbscJ1o8RBoEGp2Y +KIXV4/6Ngh43Ok9VQr6rakvHVeSlUyo84CFrqOk88mzFuvuG6zzU1+ilGVGs8tlu +Q0K2Cmt+3yq9pFch3uwoGKE0w6lO+CI6vh4jqgNq8kNVBw3V0JTgZogOeuoZD1Rd +JGCBLkVR41qvhR0Es6COgTaS6dlRAcRO0e1KmZxzWepAgkm+HtmWAfF03zyCGYu5 +MnVX6wMo8vSfSaor0KfjyqUiJ6nWjYCQ874AW8wqQAmJ8HXdRcnXazzbXBdB8Mpy +bLhn2wM7dDYBG8lRjWssMDOyqsqtkw9/Fm2LCDaonBD5VN7vg8aWt2MOdrjSSnT3 +5uH5d+fCLALCVcl6TFvWXia3KcKLfBUR3XfT0gHaGo/fBe2SGt/LYNWj3Ww95W/7 +6Ftz6D6Pzlq0AEvdpuBzx+h4EAiTTC5GDWhgyq3GO1o76ty4wXUL6/r4jk0Htec0 +Y9vfCcS+jD3Z9wprglUB98UWUpPlBbwQ/5ukgN+AjMqR1m56SUb0L6ePEAGNTB1L +xn4ufMGOAvUoQ19QYGVoMqK0K3NwYWNla29va2llIGMtYmFzZSA8c3BhY2Vrb29r +aWVAYy1iYXNlLm9yZz6JAlQEEwEIAD4WIQSfGKCTz2X5OOTI76Qp4FdRb+G78wUC +WJMMCQIbAwUJA8JnAAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRAp4FdRb+G7 +89woD/wPKuieSmCj/PH+7JfUB7l+J+VtDdLGoDCziLmZPTCasPOcaIqHuxN4Xa4/ +SNCauVuRf0XMjh1slcUqK0yfV4HcSJSMw5kMk/DYIlz9cNsntjaHrgmD9HxZNHd/ +6Y+VpPMaYhoubJs18yir+kGcSANJUb03BS9YdYj1Oua0YhPis7/wehTVACehc0ZT +wntYSwn/U/KXEsUQzOgO0dij54f5MrS9VFBoXmQLJKMPSja3Mj70+mBIrsyQqnaK ++nja9NoMO1ExZHqgpXhkiEnTYEhFi20olRhuxbMPrtLcmLkLlYJ5tOQ59pM3BmYh +aYDH2/wqT8m9mfXeLJ3NFJxibGCnmPlpfc3/rCLuz/bljI9D2OX4MfH8HZcX39tO +rOgCaAExztCV6dIprmksy/4QHXTgkguxIveAQEuZscNdCcCZ3OgVCBcynuVIS5gw +kylHs8odvym3X2EAH8iAK2XtNrnTBUvSaRHei6/PgGnyFwIapRIQqeuiGw4v0Y8H +KphzOEMDULA0SRg7yaiNQIU4OYUeazhbkYAuQvyr3Qh7BFZJO4Vh1uNXtvspm+u+ +K2mFHBFMFPCdafZSjDHqgDhdIk6vOQGchOPEk4tc9vOBi8oynWmPpRHtrE0sVNCm +8pecsSkTJlODKtx7gyBUdbzhbZuDp3NcLna8oH/Y193QlLWe5bkCDQRYkwr3ARAA +wiTra2jJpDOd+EIWFKp1Rc9zoFXKL8/sWQp5348kjept+h9TAuy6FXXoUksFxWuz +R3N5meL04YxAMzjLMu6V9zeAGIpnc29LJG1GAnVGmZwsqh9xWctvyRU0ha/OIsWH +DD5uvXaEjwNCiAYIYjZTBTQZYCoCn8LEgOp/U1bYH4FbB9SUMNVWw4Df2qnmza3Z +MW51auCjVjHiXxhgJjMvsgFHXY4wJlmUPCNf7h5fjopzbWl5eT6aW99r5wnd3anM +MHQoCvY9+/jynSdIh/YLwZD46QTl25zLAq8zvc/zLQUrseaI0IBrU9RY9JAaJ2i0 +2PrOcoJ6VisD7a08n/1AfULrt6qTzZAetRU7uY2/hNv8Qfk+a7uIQ6J5IjT6Porf +1k2iIjbBJPUrE9nv+5eJhip/B061lsab2uRYmDTjNo03mvT7+kCc0ueMQHdJkt7r +YG1mMSAbXcXr3ayaShUTqK6ZA+62xrGTdIBV7bJ/i3r++CK6OTO3svQrSAw5kP5T +1/tofXJaXc8YAyD4AZgjEbmJ6nKPDVuiyZH6RWrqgWAXddO3w4RuMEkEcAUyG8Ow +sy7yAGKl3Pv1iSd2rNzewBVRb/igJx0Pi/TGmfAJ7YXT6wfMZAayBnGYtn2kS9i4 +JQiyJee1afpmaoYjOC2zpfMcpKauyoqDo2rHE/GbzvMAEQEAAYkCPAQYAQgAJhYh +BJ8YoJPPZfk45MjvpCngV1Fv4bvzBQJYkwr3AhsMBQkDwmcAAAoJECngV1Fv4bvz +ktkP/2JJRdF/yW+OR0Njo+ZTGhBVNaaOzfhi2VQu+XbpDS8ymdJqmL0v7i+wGZ/D +hTwLTmRMQBYopEm5jU+HGBTbAwu0LF3r7ecUDx+7QUqw/u7rZco/IZws26wxhbyZ +pMWLm3iIffzkpQJ9mz3Y4HUFozV6tq5fr1NCt/cF/AknzUDzvZTif7wOAeiCh9Ad +fKf4w3sxig/7Vx4Up8qfCE4W0momjF7yS0DQxgz4O483eSUZ2dvazqYP7a9FBYfM +JmXLD2hfM5a7uGrBvnaUDODWPnWpcvySzAvsg/aw3ckbg6NGe4h3VnnzLy/u9DI9 +qtCTTCyKIfjixTN+Lxd7YyG6/G0C68moy45MRpxiuZldwDk6JDLHe8B7581V8WlJ +gBX+LwFjzcKAE0FkkXX5MbBM8sGn48phRlLc43VD+oOgIB5P6cbprbOrQ9Y/mQty +0Qvxdy7AzJGFrnZo+UMHc2JOuWBHcMvJcWGbppCpalpgmNjXTkDg0JzzhSj84nay +MLuEoA6FuF/Zo5PBvGOtFViLb3MMnsndZfjlm4QrRrWiLxYvdnqG4elFMJuVWsYA +J3ydeRpI7N3tQg6XA+pPiAeSn6evBR19n/W6h8dZN6vvFG4vlvUdm8P+dGhhxTB1 +Oc0zZg7qrYqTQnCZxPB0AltH8ZUCq2iBGFMS5UYBidPdw3e5 +=vSgE +- -----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEnxigk89l+TjkyO+kKeBXUW/hu/MFAliTEe0ACgkQKeBXUW/h +u/Pb1w/+IYx8RUaxGQxq8jphBaCwAfUvOOl3DQwPLETsvz1UYQPcNTmXbKK8GziJ +ki69eizxMcikVwTT0CinRX0NtE1qeGKmPiTT9Zxoi688QeXdDZDksOrLHGS+bqfV +WxwQG2hGUjLUqCjKsBIz4OwiZ8xqff+Z3HqYhTc1GpdwbIXG43l+tLFkU5eTaERU +u/uSPjnmbxrZRGLzv0fnrppEKXPTBmm8O3hIM9Cp+rZIQw9rbbkGSGeRXtSDDsC/ +6dkBKvM7YDqw/9/EnFbrw1vMBnVDdmMvMH/KQIxDuF+mEkq9eNOvR8QCJa8SDMOH +Hdhi8sJqS7oX91kH0TU86Uym+/GKlUfq/VDZCGssOqPlFLc0ZOWKL1VoReVwb+34 +hkowMP5i4XieXuY4JtBTuDjvGbauZDorFqONosAzq67zf2FTY3JrGZay0Q+3/rs9 +q3FbU8esjM/q64XltuWmZfGnbRU3Xdfr+V/YCqLiUXfsLJ38WZBXruL31ar9CjcL +PMN/YipyvSkSze8IBHBtyonDg5Zug7ntL6Ku58XitQBHRy8KDuJL74RiABmri2DM +Tpo1kwGokd3Sj24VX4JEg/jAczC93x/F9B2BKCY1tvqSDCdavrToSbSOva7//9sC +MV2oN8slEE5fPgxT9A8DTORImfstI9AnUBUn+julhMer3FSaNWk= +=MXQM +-----END PGP SIGNATURE----- diff --git a/content/pgp/msg b/content/pgp/msg new file mode 100755 index 0000000..cd4a21d --- /dev/null +++ b/content/pgp/msg @@ -0,0 +1,16 @@ +Following are my public gpg key as well as Threema Fingerprint and others. + +Threema +======= +ID: 77WYDHA2 +Fingerprint: AB2A 4F8A 8FF9 6335 75C2 4E0C 175B C0D6 + +Public Key Cryptograpy (GnuPG) +============================== + +Plain copy of my key can be found here +https://spacekookie.de/pgp/6FE1BBF3.asc + +It is also available on the MIT keyserver. + +This document was last changed/ signed at around diff --git a/content/teaching/gameofcodes/01-goc-setup-basics.md b/content/teaching/gameofcodes/01-goc-setup-basics.md new file mode 100755 index 0000000..d7c4fc7 --- /dev/null +++ b/content/teaching/gameofcodes/01-goc-setup-basics.md @@ -0,0 +1,296 @@ +Title: 01. (LibGDX) Game of Codes: The Setup & Basics +Category: Game of Codes +Tags: LibGDX, Tutorial, Game Dev +Slug: 01-libgdx-game-of-codes-the-setup-basics +Status: published + +**Hey everybody and welcome to a new/ old series on this blog about LibGDX.** + +LibGDX is a Java game development framework based on LWJGL and OpenGL which makes it relatively easy to make a game from scratch without requiring a big engine. It supports Desktop, Android, iOS and HTML as export targets which means that your game is automatically cross platform. + +Getting to know the framework can be challenging in the beginning, which is why I wanted to make a little series about it. Before I moved my blog to a static site generator I had a rather popular series about LibGDX called "Game of Codes". Unfortunately large parts of the guides are now outdated and no longer relevant. And the Wordpress export destroyed most of the formatting. + +Which is why I decided to rewrite them. Here it is: the Game of Codes! *plays theme song* + +NOTE: This tutorial requires a basic level of programming/ scripting skills. General Java knowledge is required or at the very least knowledge of how coding works. If you don't know that yet then I +recommend [Bucky Roberts Java Programming series on Youtube](https://www.youtube.com/watch?v=Hl-zzrqQoSE&list=PLYJQBQw9Wdiid6eT1_DqBP3lnbJCzo3s8). +It's very good! + + +### Setting up LibGDX + +Now that we've got that out-of-the-way let's set up our workspace to make some neat games. I am writing and testing these tutorials on Linux. So if there are some platform specific issues you encounter, please give me feedback at [kookie@spacekookie.de](mailto:kookie@spacekookie.de). + +1. First of all you'll need to have Java and an IDE (Integrated Development Environment) installed on your computer. In this series I will be assuming that you're using **Eclipse**. For pointers on how to install that, please use Google! + - LibGDX uses Gradle as a build system. The latest version of eclipse has it integrated but older versions might require a plugin! +3. Go to [libgdx.badlogicgames.com](http://libgdx.badlogicgames.com/) and download the libgdx setup app. It will help you configure your project with Gradle so you can either develop on it in a text editor of your choice or import it into an IDE. + +<img class="dual" src="/images/gameofcodes/series01/02_setup_ui.png" align="left"> + +<img class="dual" src="/images/gameofcodes/series01/01_setup_ui.png" align="right"> + +Let's step through the setup UI on your left real quick. We have some base settings. You can fill out the name of the game, the name of the main class as well as the package. If you're new to Java, the convention is that every application has a unique package root. And it's usually the reverse of a web-address. So for me it's `de.spacekookie` and then the project name. In homage to the original tutorial series I will call it `de.spacekookie.starchaser`. + +Also important to choose are the directory where to setup the project as well as your Android SDK location (if you want to build on Android). I will be ignoring Android for now and focus on the Desktop. + +<br/><br/><br/> + +<!-- Introduction to the module we need --> + +Make sure that you tick the following extentions (and extentions from the "third party" visible below the main window): + + - Ashley (Entity management library) + - Box2D (2D physics) + - Box2DLights (2D realistic lighting) + - VisUI (Good looking skin for UI elements) + +Also make sure that if you want to use an IDE (such as Eclipse or IntelliJ) to select the project export from under "Advanced". When you're done with the configuration, hit that lovely "Generate" button and let's get going with development :) + +I will skip the importing step because that will be different for different IDE's. All I will say is that in Eclipse you should avoid putting your workspace *inside* your project directory as it will cause issues for you in the future (or during import). + +> **Tip** + +> While there are many ways to work on LibGDX, in this series I will assume that the project was added to Eclipse via Gradle while the building is done via a normal "Java Application" launch target in Eclipse. This is (in my opinion) the best of both worlds with a quick and easy build but the dependency management of Gradle built int the IDE. + +### Working with LibGDX + +So assuming that you were able to follow until here, you should now have a Java development IDE in front of you + +<!-- Add a picture of Eclipse here? --> + +> **Tip** + +> LibGDX is very closely entangled with Android. For example, if you create a project to have an Android target, all of the game assets will be stored in the "Android" subfolder because of who the system handles file imports. This means that the Desktop/ iOS and HTML versions only use symlinks to the Android assets directory. + +> If you don't have an Android project (only Desktop for example) assets are simply stored in your core project with all your game code! + +Now that everything is ready to go, let's investigate a little into what code was already generated for us and what we can do with it. Feel free to just hit that "build" button and get started but we're taking a more scientific approach :) + +<img class="dual" src="/images/gameofcodes/series01/04_eclipse.png" align="left"> + +As you should already have noted there are several projects that were created for you. One project without a suffix and multiples with suffixes. The one project without a suffix is called the "meta" project (it contains relatively uninteresting things), while the other projects have to be divided into "core" and "targets". The idea is simple: you write all your logic, rendering and gameplay into the "core" while platform dependant code is used in the "targets". If this is complicated to understand, don't worry. It'll become clearer when using it. + +So as explained above, we will write most of our code in the highlighted "core" module. It is where you should in fact write all of your game code that isn't platform-specific to launch the game (for example getting the screen size or setting a custom icon). + +Please go ahead and open up the two files marked by arrows. They are the only code files that were generated for me. The lower one labelled `DesktopLauncher.java` contains the main function which will actually launch our game. The code should be very straight forward and we will look at the configuration settings later. + +<!-- Explain the basic structure of the project & function lifetimes --> + +The second file, labelled `StarChaser.java` in my case (and whatever you named your main class in the setup tool) contains much more interesting goodies: game code! + +Inspecting the code from the StarChaser class you can see a few functions in there that are responsible for describing the lifetime of our game object. These function are `create`, `render` and `dispose`. The create, play and, when we're done, destroy our game object. Everything else we do lives in between those functions. + +In fact, there are a few extra steps in between that are hidden from you by default. Check out the following list: + +```java + +/** Called when the game is created **/ +public void create(); + +/** Called after create and every time the window is resized (if that is allowed) **/ +public void resize(int width, int heights); + +/** Starts calling after create() and resize() and will be + * recalled every frame. This is your game loop! **/ +public void render(); + +/** Called when the game is closed on Android **/ +public void pause(); + +/** Called when the game is re-opened on Android **/ +public void resume(); + +/** Called when the game is closed. **/ +public void dispose(); + +``` + +This layout allows for very structured game code that walks through stages. You can of course allocate new objects in any of these functions to move functionality away from one class but in the end, you are always bound by the lifecycle of your game object. Note that all of these functions are provided by the `ApplicationAdapter` super-class that our main game class implements. + +> **Tip** + +> If you're ever curious about something you use/ extend/ implement works under the hood, don't be afraid to right-click on the part in question and click "Open Declaration" (when using Eclipse). This will open the source file for this module and you can see what is happening behind the scenes. In fact, I highly recommend being curious throughout this entire series. + +<!-- Explain the awefulness that is Eclipse run configurations --> + +If you haven't already launched the game to see what it does, I would recommend you do that now. Click the small black arrow next to the green "play" symbol in the top bar (or F5 in Eclipse), select "Launch Configurations" and create a new "Java Application" config. Check out the picture below for reference on how to fill it out. And if you have issues in this step, there are plenty of tutorials that go into depth online! + + + + +<div class="alert alert-warning"> +<h1>Fixing an Eclipse error</h1> + +<br /> + +<p>By default LibGDX uses Gradle. This means that paths are considered differently than when you're using Eclipse. For example, the above code will not by default work with Eclipse unless you tweak something. In fact, you might encounter an error like this:</p> + +<pre> +Exception in thread "LWJGL Application" com.badlogic.gdx.utils.GdxRuntimeException: Couldn't load file: badlogic.jpg + at com.badlogic.gdx.graphics.Pixmap.<init>(Pixmap.java:148) + at com.badlogic.gdx.graphics.TextureData$Factory.loadFromFile(TextureData.java:98) + at com.badlogic.gdx.graphics.Texture.<init>(Texture.java:100) + at com.badlogic.gdx.graphics.Texture.<init>(Texture.java:92) + at com.badlogic.gdx.graphics.Texture.<init>(Texture.java:88) + at de.spacekookie.starchaser.StarChaser.create(StarChaser.java:17) + at com.badlogic.gdx.backends.lwjgl.LwjglApplication.mainLoop(LwjglApplication.java:147) + at com.badlogic.gdx.backends.lwjgl.LwjglApplication$1.run(LwjglApplication.java:124) +Caused by: com.badlogic.gdx.utils.GdxRuntimeException: File not found: badlogic.jpg (Internal) + at com.badlogic.gdx.files.FileHandle.read(FileHandle.java:136) + at com.badlogic.gdx.files.FileHandle.readBytes(FileHandle.java:222) + at com.badlogic.gdx.graphics.Pixmap.<init>(Pixmap.java:145) + ... 7 more +</pre> + +<p>While when you build your project with <code>gradle run</code> it will work. This is because Eclipse handles import scopes differently and we need to respect that. You now have two choices:</p> + +<ol> + <li>You hard-code import paths from the filesystem root (i.e. "/home/spacekookie/.../artpack1/uss_pixel.png"</li> + <li>You add your assets folder to the source path in Eclipse. <strong>This is what I will be doing in this series!</strong></li> +</ol> + +<p>Right-click on your desktop project and navigate to "configure build path" as shown in the picture below.</p> + +<img src="/images/gameofcodes/series01/06_eclipse.png"> + +<p>Select "Add Folder" in the window that should have opened and in that dialog select "assets". Close the dialog and try to run the game again. It should now work!</p> + +<p>If you're having issues with this step, feel free to e-mail me at <a href="mailto:kookie@spacekookie.de">kookie@spacekookie.de</a></p> +</div> + +### Understanding the Code + +*waits for you to launch the game* + +Cute, eh? Not exactly a game but it's a start. The example demonstrates a few basic principles as well as *super* basic 2D rendering. However, before we go, throw it all away and implement our own cool stuff we should try to understand how the current code works. + + +```java +//... + +public class StarChaser extends ApplicationAdapter { + SpriteBatch batch; + Texture img; + + @Override + public void create () { + batch = new SpriteBatch(); + img = new Texture("badlogic.jpg"); + } + + @Override + public void render () { + Gdx.gl.glClearColor(1, 0, 0, 1); + Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); + batch.begin(); + batch.draw(img, 0, 0); + batch.end(); + } + + @Override + public void dispose () { + batch.dispose(); + img.dispose(); + } +} +``` + +Let's ignore the package definition and import statements and jump straight into the class declaration. We're creating a class, extending the `ApplicationAdapter` which is responsible for turning the class into an actual game object (as described above). + +The first function that would be invoked is the Constructor. Because there is none here, we will skip it. The next function being called is `create()`. It initialises a new SpriteBatch and afterwards a texture for "badlogic.jpg". + +You will be able to find the texture in the assets folder. And, if you change it, you will notice the changes in game as well. So far so good. What the hell is a SpriteBatch? + +A `SpriteBatch` is an object which is used to keep context during 2D render calls. Basically, you give it a positional and transformational reference frame (in our case DEFAULT) and then tell it to draw 2D images. But I'm getting ahead of myself. Because in this function we only create a new SpriteBatch. So all is good. + +Moving swiftly on to the `render()` function. This one is more interesting. The first two lines are two OpenGL calls which prepare a frame to be drawn. The first line sets up a colour while the second line tells the graphics processor to take the prepared colour and paint the entire frame with it. The colour representation is in RGBA (Red, Green, Blue, Alpha) with floating numbers between 0 and 1. So (1, 0, 0, 1) is red. *Try to change the colour and see the result!* + +The last three lines in the `render` function tell the SpriteBatch we created early to start, draw our texture and afterwards stop again. This marks the end of the frame at which point the next one will begin shortly. + +> **Tip** + +> Try to copy the `batch.draw(...)` command and change the coordinates from (0,0) to (200, 0). You will notice how a second instance of our texture is drawn at a different location. Cool, eh? + +The last function in the file is `dispose()`. It is only called when we close the game and usually only has other dispose calls in it. In our case, we make sure to properly dispose of the SpriteBatch and the Texture as both of them allocate memory on the graphics processor and we don't want to leak memory! + + +### Adding to the game + +Phew! That was quite a lot to take in, I'm sure. And don't worry if you're a bit fuzzy on some of the details. We will go over some of these things again when we use it. Additionally there are a lot of great resources out on the internet for you to help you out. + +But before we wrap up this (way too long) article, I want to do something to make the game feel more like...well, a game. So go ahead and open the image processor of your choice (I will be using GIMP) and create a 128x128 pixel texture that one might consider a spaceship. + +<!-- ADD PICTURE OF USS PIXEL HERE --> + +You don't have to neccessarily make it 128x128 (I will) but the dimentions of the picture need to be a power of two (so 2, 4, 8, +16, 32, 64, 128, 256, 512, 1024, 2048, 4096, ...). This has to do with how computers load textures (details later). + +What is that you say? You're too lazy? You don't have an image processing application? You managed to delete Paint from your computer? Kudos. Fine, you can use my graphics (contains the USS Pixel, a laser burst and a background image from the web). + +**Download [my artpack here](/downloads/gameofcodes/artpack1.zip).** + +I would suggest you create a new directory inside your games "assets" folder so that we don't get confused about what's what. So this is how your core/assets/ folder should look like now: + +<pre> +❤ (idenna) ~/P/p/c/starchaser/core> tree assets/ +assets/ +├── artpack1 +│ ├── background.png +│ ├── pixel_blast.png +│ └── uss_pixel.png +└── badlogic.jpg + +1 directory, 4 files +</pre> + +First, why don't you go and change the line + +```java + img = new Texture("badlogic.jpg");9 +``` + +to + +```java +img = new Texture("artpack1/uss_pixel.png"); +``` + +and marvel at the amazingness that is my art skills :) + +When launching the game now you will notice that the face texture has been replaced with a spaceship. However, this doesn't feel very space-y or even game-y yet. So let's not stop here! Reserve a new texture variable in your class and create it with a different resource file during the create function. Your source code should resemble something like the following + +```java +Texture img, background; + +@Override +public void create() { + batch = new SpriteBatch(); + img = new Texture("artpack1/uss_pixel.png"); + background = new Texture("artpack1/background.png"); +} +``` + +Then in the render function, before drawing the ship, draw the background texture first! This will make sure that the background is always behind the ship and not vice versa. + +```java + batch.begin(); + batch.draw(background, 0, 0); + batch.draw(img, 0, 0); + batch.end(); +``` + +Run the game and feel your jaw drop. It should look a lot nicer now. There is still no game logic or advanced rendering but we're getting there. Try to flip the draw calls around and see what happens to the ship. + +Also, you might have played around with the draw calls earlier and realised that `batch.draw(...)` in it's simplest form takes a texture and a coordinate. We will use more advanced draw calls later as this (for example) can't consider rotation. + + + +<hr/> + +Wow! That ended up being longer than I expected :) + +In the next tutorial we will look at how to bring movement into the game. This consists of actually updating certain parts of the game as well as handling user input. See you then! + +Kate + +[[Next post about Input & Movement](/game-of-codes/02-input-and-movement/)]
\ No newline at end of file diff --git a/content/teaching/gameofcodes/02-goc-input-movement.md b/content/teaching/gameofcodes/02-goc-input-movement.md new file mode 100644 index 0000000..58aaa2c --- /dev/null +++ b/content/teaching/gameofcodes/02-goc-input-movement.md @@ -0,0 +1,270 @@ +Title: 02. (LibGDX) Game of Codes: Input & Movement +Category: Game of Codes +Tags: LibGDX, Tutorial, Game Dev +Slug: 02-input-and-movement +Status: published + +Welcome back to the Game of Codes, an introduction series to the LibGDX framework. In the last edition we learned how to set up LibGDX with a new Java project and draw simple pictures onto the screen. We used textures to import that image and then drew it via a SpriteBatch. + +Today we will look at basic input handling and how to make things move on screen. And though we won't be able to cover everything in this article we will explore the basic input stack that LibGDX has to offer and how to make things in your game move. + +Exciting! :) + +A little note: all the code that gets shown off here is available in a [Github repository](https://github.com/spacekookie/starchaser) for you to tinker with. After each tutorial I tag the commit so that it's obvious what got changed when! + +You can also use that repository to report issues or give feedback if you'd like. Otherwise, my email is always available! + +### Registering input + +Before we talk about inputs, we need to think about what it even means to register an input. When the user presses a button in our game, we want that button press to notify us so we can affect some behaviour. To understand what is going on here, we should consult the following graphic. + + + +You can see that LibGDX (obviously) considers the main run loop of our game...a loop :) In this series we only really care about the purple boxes. And in this article in particular, we are only considering the first purple box: "Input". What LibGDX does during this step is poll all input hardware for activity. It then writes this activity into a buffer and signals all registered input adapters to handle their input. + +So with that in mind, there are two ways of checking for input. The first is essentially polling the hardware again yourself during the "Render" step, while the other hooks into the "Input" step and is called asynchronously. + +Both ways of handling input are slightly unique. And we will start with the polling aproach first to demonstrate some basic functions. + +First, go into the main game class and add a position variable into the class body: + +```java + +import com.badlogic.gdx.math.Vector2; + +public class StarChaser extends ApplicationAdapter { + //... + + Vector2 position; + + // ... +} +``` + +Furthermore, in the `create` block of the game, initialise the position to some value that is greater than `(0,0)` and not too big to be off window :) + +```java + position = new Vector2(250, 150); +``` + +If you're not too familar with Java, what this means is that we declare `position` to be a object variable which means that every function in an instance of this class can access it (Object-Oriented Programming). In the `create` function we then initialise it to have a value other than `null`. + +What that means now is that we can use the position variable (which has an `x` and a `y` component) in our draw calls to tell the picture where to go. The main advantage of this is that when we change the position variable (say...via a button press), the picture gets an updated position! + +```java + public void render() { + Gdx.gl.glClearColor(1, 0, 0, 1); + Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); + + updateInputs(); + + batch.begin(); + batch.draw(background, 0, 0); + batch.draw(img, position.x, position.y); + batch.end(); + } +``` + +So far so good...wait. Do you see that `updateInputs()` function call there? That wasn't there last time. In fact, it doesn't yet exist. But it should soon. Why don't you go and create a new function in the class somewhere with the signature `void updateInputs() { ... }`. We will fill it's body with some stuff soon. + +So fundamentally, we want to poll inputs and then when we have determined that an input is pressed we want to enact some functionality. The simplest form of polling buttons is with the `Gdx.input.isKeyPressed(key)` function where `key` is an integer variable that corresponds to a key-code. Don't worry, there are bindings that make it easier and you don't have to manually check for numbers ;) + +> **Tip** + +> Other input polling functions include `isButtonPressed(button)` for mouse buttons as well as `getX()`, `getY()` which give you the cursor position in your game window! + + +So why don't you add the following lines of code to your `updateInputs` function and see where it gets us. + +```java + if (Gdx.input.isKeyPressed(Keys.W)) { + position.y++; + } else if (Gdx.input.isKeyPressed(Keys.S)) { + position.y--; + } else if (Gdx.input.isKeyPressed(Keys.A)) { + position.x--; + } else if (Gdx.input.isKeyPressed(Keys.D)) { + position.x++; + } +``` + +You can run this now and see what happens. When we press the keys in question the image on screen will move all over the place. Cool! But...it's not particularly pretty, is it? + +For one, we can only move in one direction simultaniously. But even if we split the X-Y axis into two different if-blocks, there is still the problem that `W` will always have precedence over `S` and `A` will have precedence over `D`. Which means that if we press all keys, we will *always* move top-left. And that's not particularly great :( + +> **Tip** + +> Also consider the following: when you move in one direction you apply 1 to the axis you're moving along. But if you move in two directions, you apply 1 in both x and y direction. Which means that (via trigonometry) you actually move **~1.41** in total. This means your game isn't consistent about rules. + +> It's clear that more logic is required to move! + +So how do we fix this? We can of course add more logic to our `updateInputs()` function but it will result in a lot of dirty hacks. And while game development is often about making dirty hacks that work, starting a project off some will quickly make your code-base unmaintainable. + + +### Using Input Adapters + +The second method of getting input from the user I mentioned earlier is via an input adapter. It can be considered faster because we only do input polling once and it allows us to use input signals between different game components (gameplay, game HUD, etc.) + +So how do we use this awesome functionality? Well, it's simple. We need an InputAdapter. So first, create a new class via Eclipse. If you don't know how, consult the *suuuuper* helpful screenshot below :') + + + +Give it a useful name like `InputHandle` or `ShipInputHandle` or something. You can be quite specific in the naming because you very often have multiple input adapters for different aspects and parts of your game. So being specific in the naming just helps you out in the long run. + +Once you've done that you should be greeted with a very boring and empty class in your editor. So we need to add some basic code to get going. I took the liberty of doing that and will now show off what I did (and you'll finally get to see what name I chose...). + +```java + +import com.badlogic.gdx.InputAdapter; +import com.badlogic.gdx.math.Vector2; + +public class ShipInputHandle extends InputAdapter { + Vector2 shipPosition; + + public ShipInputHandle(Vector2 shipPosition) { + this.shipPosition = shipPosition; + } +} + +``` + +So, as you can see we have a class that extends `InputAdapter` as a subclass. With that comes free functionality we don't have to implement ourselves. Additionally I create a constructor that takes a vector and stores it as an instance variable (like before in the game class). Note that we're not copying the value here but rather storing a reference to the "original" variable in the game. + +> **Tip** + +> If you're coming from a language like C or C++ this can be quite confusing. What is a copy, what is a reference? In general: java always passes by reference (pointer) unless it is a primitive value. What is a primitive value? `int`, `float`, `double`, `boolean`, `byte`, `long` and all other lower-case types that become purple in the IDE (keywords). + +Next up, let's handle some inputs! The principle is similar to the polling: we check what input we are handling (because we only have generic functions - this will become obvious in a second), then invoke some behaviour. But as we have already seen before, we need to store some state. And that's why this is perfect: we have a new class where we can store the input state to check against. But at the same time, it's contained and doesn't clutter our main game class. + +Now...to solve the problem of moving in multiple directions at the same time, without letting one direction take precidence over another we can use a tri-state variable. In Java this can easily be done with an enum. Create a enum titled `TS` (or TriState if you feel verbose) in our `ShipInputHandle` class and create two values `x` and `y` that use it. The initial value should be `NEUTRAL` + +```java + enum TS { POS, NEG, NEUT }; + + TS x = TS.NEUT, y = TS.NEUT; +``` + +In the `keyDown(int keycode)` and `keyUp(int keycode)` functions we can then use a switch statement to flick the `x` and `y` variables in their favour. We *can* also perform a simple check if the `x`, `y` variables are already set to avoid another direction overwriting our current movement. But then again, maybe you consider this preferred behaviour. I chose to perform the check in the following code! + +```java +public boolean keyDown(int keycode) { + + switch (keycode) { + case Keys.W: + if (y == TS.NEUT) + y = TS.POS; + break; + case Keys.S: + if (y == TS.NEUT) + y = TS.NEG; + break; + case Keys.A: + if (x == TS.NEUT) + x = TS.NEG; + break; + case Keys.D: + if (x == TS.NEUT) + x = TS.POS; + break; + } + + return true; +} +``` + +Notice that `return true` at the end of that function? That's what you could call "Input Cascade". It is a concept that we will use extensively in later articles of this series. In short, it is the concept of letting an input signal cascade through different input adapters until it is ended. Returning true in this function signals the core input controller that we are ending the signal: it will not cascade to lower ranking controllers. This means that if you replace it with a `return false`, controllers down the stack will be able to pick up on the signal and use it. + +But again, this will become important in later tutorials. For now, let's just end the signal and get it over with. Next up, we can implement the `keyUp` function very simply by checking what axis our key-presses affect and then resetting that direction back to `NEUT` if it is applicable. Not a perfect solution but something that will definately work is implemented below. + +```java +public boolean keyUp(int keycode) { + switch (keycode) { + case Keys.W: + if (y == TS.POS) + y = TS.NEUT; + break; + + case Keys.S: + if (y == TS.NEG) + y = TS.NEUT; + break; + + case Keys.A: + if (x == TS.NEG) + x = TS.NEUT; + break; + + case Keys.D: + if (x == TS.POS) + x = TS.NEUT; + break; + } + + return true; +} +``` + +Now we're almost done. One thing is missing however! We keep a state depending on the inputs of our user. But we don't apply anything to the vector we stored based on that state. This is where we will need to build something slightly custom because the InputAdapter doesn't force you into any workflow. + +I recommend you create a new function `void update() { ... }` in the input class and make it public. We consider this function to be called every frame and apply values to the x and y components of the position vector, depending on the state of our inputs. + +The following code very quickly checks if we need to apply movement at all (is not NEUT) and then does a conditional application of 1 or -1 to each component. + +```java +public void update() { + if(x != TS.NEUT) shipPosition.x += (x == TS.POS) ? 1 : -1; + if(y != TS.NEUT) shipPosition.y += (y == TS.POS) ? 1 : -1; +} +``` + +Now we're done modifying the ShipInputHandle...for now :) Go back to the main game class. There are two more things to do before we can enjoy our new input handles. First, remove the old `handleInputs()` function. We don't need or want it anymore. Also make sure to remove it's function call from the `render()` function. + +Secondly, create a ShipInputHandle object and initialise it with our vector. Take the following code segment as reference. + +The last line in the `create()` function is key and not to be forgotten! It registers our custom input handler with the LibGDX input system and makes sure that our functions are *actually* being called :) + +```java + +public class StarChaser extends ApplicationAdapter { + + // ... + + ShipInputHandle input; + + @Override + public void create() { + // ... + + position = new Vector2(250, 150); + input = new ShipInputHandle(position); + + Gdx.input.setInputProcessor(input); + } + + @Override + public void render() { + + // ... + + input.update(); + + // ... + } + + // ... +} +``` + +And that's it! Run that code and you'll be able to move the image around in a much nicer fashion! Again, this is far from perfect. And you will notice that switching quickly from going-left to going-right can make the whole thing just stop on "Neutral". You can remove the additional check which I added. Realistically, you need a lot more state to mirror what the user is putting into your system if you want real-feedback and logical behaviour from your units. But this will do for now! + +And more importantly...it should have given you a glimpse at how to use the InputAdapters. + +<hr /> + +And that's it for this article! Originally I wanted to talk a little bit about rotation. But I realised that I would have had to make a lot of assumptions about systems and not be able to go into too much depth without making the article *waaaayy* too long. + +So that'll be handled in the [next issue](https://media.giphy.com/media/z85AlA6CBKxEI/giphy.gif). + +Have a good day/ night, + +Kate diff --git a/content/teaching/gameofcodes/03-goc-input-rotation.md b/content/teaching/gameofcodes/03-goc-input-rotation.md new file mode 100644 index 0000000..fb93d33 --- /dev/null +++ b/content/teaching/gameofcodes/03-goc-input-rotation.md @@ -0,0 +1,159 @@ +Title: 03. (LibGDX) Game of Codes: Rotation & Advanced Movement +Category: Game of Codes +Tags: LibGDX, Tutorial, Game Dev +Slug: 03-rotation-and-advmovements +Status: published + +Welcome back to the Game of Codes, an introduction series to the LibGDX framework. In the öast edition we learned how to listen for user input, keep it's state for consistency and apply it to the world we are building. We did this by simply using a vector as a position for an image to align to. + +Today we will have a look at some more input but more importantly: rotation! And with that, also look at some more advanced movement concepts like momentum and some advice how to implement certain movement patterns. + +A little note: all the code that gets shown off here is available in a [Github repository](https://github.com/spacekookie/starchaser) for you to tinker with. After each tutorial I tag the commit so that it's obvious what got changed when! + +You can also use that repository to report issues or give feedback if you'd like. Otherwise, my email is always available! + + +### Naïve approach + +So let's just take a naïve approach here. We have a vector that is essentially the position of our "ship". And it can have a rotation. So what we do is listen for two new key presses (in my case for `Q` and `E` - left and right rotation) and then create another tri-state variable `rotation` that we can use to determine whether we should rotate left or right. + +```java + switch (keycode) { + case Keys.W: + // ... + + /** Handling rotation */ + case Keys.Q: + rotation = TS.NEG; + break; + case Keys.E: + rotation = TS.POS; + break; + } +``` + +The inverse applies for the `keyUp(...)` function. + +```java + switch (keycode) { + // ... + + case Keys.Q: + if (rotation == TS.NEG) + rotation = TS.NEUT; + break; + + case Keys.E: + if (rotation == TS.POS) + rotation = TS.NEUT; + break; + } +``` + +Our update code needs to be appended slightly. This isn't the most pretty way to do this but for now it'll be alright. + +```java +public void update() { + // ... + + if (rotation == TS.POS) + shipPosition.rotate(1); + else if (rotation == TS.NEG) + shipPosition.rotate(-1); +} +``` + +Now. What does this actually mean. We rotate the *positional* vector for the ship. You might have an inkling of what is about to happen but if you don't start the game and look at it. Not quite what we had in mind, is it? + + + +So what's happening here? Well, our positional vector points to where the ship is. From the origin. Which is in the bottom left of the screen. At coordinates `(0, 0)`... So when we rotate the positional vector, we rotate the ship around the origin. Furthermore, we never told the `SpriteBatch` to rotate the image we're drawing. That's why the ship orientation stays exactly the same: pointed upwards. + + +### Using TextureRegions + +So let's fix this one problem at a time. Let's actually make the ship texture rotate depending on some value (in our case, the phony vector angle). For this we need to look at how we draw things. Right now, that's a texture. + +A texture is essentially a raw memory map of an image, loaded onto the GPU. That's why the texture needs to be a power of two because that's how GPU's handle textures in their memory. But what this also means is that if we have multiple textures this will cause a lot of overhead because loading textures in and out of memory from the GPU is expensive. + +Also, all transformations to the texture we need to apply manually. Transformations include scaling, moving and rotation. And especially the last one can be challenging. + +**Enter: TextureRegion!** + +Now, a `TextureRegion` is a collection of textures, essentially a large texture with bits cut out of it. This way we can bundle all our textures together into one large one (or several large ones) while marking different parts of the texture as regions so that we can handle them in the future. + +What this also means is that simple transformations can be done on the CPU which is slower but much easier than performing them on the GPU. This means the textures are still stored on the GPU but we get more control over how to transform them. Let's use this in our game! + +```java + +public class StarChaser extends ApplicationAdapter { + + // ... + + TextureRegion img; + + // ... + + @Override + public void create() { + batch = new SpriteBatch(); + img = new TextureRegion(new Texture("artpack1/uss_pixel.png")); + + // ... + } +``` + +The code above creates a TextureRegion instead of a Texture. In this case, we aren't using any of the memory saving benefits of using TextureRegions but that doesn't matter. We can still take advantage of it. + +Specifically, we will change the `batch.draw(...)` function to take more parameters. But first, create a second vector, call it "direction" and initialise it with `(0, 1)`. + +```java + +final float sizeX = img.getRegionWidth(); +final float sizeY = img.getRegionHeight(); + +batch.draw(img, // The TextureRegion we draw + position.x, // Root X position + position.y, // Root Y position + sizeX / 2, // Rotation origin X (center point) + sizeY / 2, // Rotation origin X (center point) + sizeX, // Draw width + sizeY, // Draw height + 1, 1, // Scaling factor (1 is fine) + direction.angle()); // Region angle (around origin) + +``` + +Additionally, we need to adjust our ShipInputHandle class because we need to make it use our direction vector. The code snippet below will outline what you need to change. Essentially: we rotate our direction vector and noramlise it after every step because rotating vectors actually changes their length. + +```java +public class ShipInputHandle extends InputAdapter { + Vector2 pos, dir; + + // ... + + public ShipInputHandle(Vector2 shipPosition, Vector2 direction) { + this.pos = shipPosition; + this.dir = direction; + } + + // ... + + public void update() { + if (rotation == TS.POS) + dir.rotate(1); + else if (rotation == TS.NEG) + dir.rotate(-1); + + dir.nor(); + + // ... + } +} +``` + +If you launch this configuration you will notice that the ship rotates around it's centre point correctly! YAY! You will notice that you can still move your ship independant of it's rotation. You might consider this a feature because it allows you to fly one way and shoot backwards (think Battlestar Galactica Vipers!). But in our case, we want the ship to always fly in the direction that it's pointing towards. + + + +This is relatively simple. We only need to change the position update code to make this happen. In fact, we only need to consider the direction vector when applying a new position.
\ No newline at end of file diff --git a/content/teaching/jni/01-jni-intro.md b/content/teaching/jni/01-jni-intro.md new file mode 100644 index 0000000..59b752d --- /dev/null +++ b/content/teaching/jni/01-jni-intro.md @@ -0,0 +1,110 @@ +Title: 01. (Java Native Access) The basics +Category: JNI +Tags: Java, Tutorial, Programming +Slug: 01-jni-the-idea-foreign-function-interfaces +Status: draft + +Regular readers of my blog (or listeners of my afk ramblings) will know that I like Java. I'm sometimes not quite sure why but there it goes, let's just assume that as an axiome for a second. + +Java is pretty damn good at a lot of stuff. It compiles to a high performant byte-code and it's JIT compiler is smart, fault-tolerant and self optimising. It has a plethora of libraries and toolkits to choose from and making nearly anything is pretty damn if you don't mind writing a verbose language or [cheating](https://projectlombok.org/) a bit. + +Then so far so good. What is this about then? Well...many things that Java doesn't do in it's standard lib you can still do. And it's something too many people to know about. For good reasons. Fault tolerance and optimisation on the side of the JIT compiler goes out the window and existing documentation is lackluster at best, in most cases outdated by decades at this point. Java is (among other things) an enterprise language and the tech hipsters have *looong* moved on from it. And so have people writing guides about it. + +That is about to change (to some small extent) + + +### What is JNI? + +The **J**ava **N**ative **I**nterface is a foreign-function-interface to the JVM, the virtual machine and JIT compiler environment that all Java code runs in. It allows you to write C/C++ code that is called by your existing Java project and even make calls *back* into your java code for callbacks (for example for logging). + +It features a very low overhead, practically non-existant safety checking and allows for pretty performant Java-native interop. In fact, switching from the Java context to a native function context only takes [a few nanoseconds](http://stackoverflow.com/a/13977914/2443595). After that you get the raw performance of native code and all the beautiful header bindings that come with that. + +Unfortunately setting this up isn't trivial and outdated documentation/ tutorials, that ignore modern build systems, don't make it easier. And while I will get into the nitty-gritty of what you should do/ avoid in the next article (or two), first I want to outline how java-native interop generally works. + + +### Writing a "native" class + +Everything in Java is a class and this is no exception. Thus we first need to provide one that has a few `native` functions that we can then later implement. Other than native functions this class can contain normal java code although I would recommend you don't do that for the sake of readability. + +```java + +class JniSomething { + + static { + // TODO: Load library + } + + private long something; + + public native void initSomething(String name, int count); + + public native void doSomething(); + + public static native void status(int mode); +} + +``` + +Two things that you should notice + +1. We have a static initialiser block which we will later use to load a native library +2. We have a `long` type field in our class which will become important later. For now it shows that "native" classes can have fields just like any other class. + +You can also see that we can have static and non-static native functions. Parameters can be primitives and classes although I only demonstrated `String` as a class here (which is a bit of a special case in JNI land) + +### Native code generation + +We are about a third of the way there. Unfortunately this is where it becomes a little less clean and easy to manage. From our class definition that includes native functions we will now generate a header that we can build native function implementations for. + +The tool we will use is called `javah` so make sure it's included in what your operating system packages as java. On most Linux distributions it should come installed with the JDK, on Windows and Mac...I have no idea. Figure it out and e-mail me so I can add it to the article. + +Assuming that your "project" structure looks something like this and your current directory is `src` + +``` + 🚀 (normandy) ~> tree project/ +project/ +└── src + └── de + └── spacekookie + └── JniSomething.java +``` + +then you can generate the jni header file in the project root directory as follows + +```console +javah -verbose -jni -o ../JniSomething.h de.spacekookie.JniSomething +``` + +So far so good. You can look at the file now if you want. It's actually pretty ugly code. The function names are designed to *never* clash with anything else because of how Java and C++ have *very* different approaches when it comes to scoping things. The last part of this intro will be writing code that uses these headers to do something in native code. + + +### Writing & linking native functions + +Aaaaand this is where things get really complicated real fast. There are a few things we need to do at this point and none of them are trivial + +1. We need to setup our build environment so that we can find the `<jni.h>` utility header + - Platform specific problems I might add + - Also very dependant on the build system we might be using later +2. Write and compile the native code that does *something* and make a library (for us that is an `.so` because Linux) +3. Load the library correctly as to not crash the JVM + +Easy as pie :) + +First things first, we need to find the Java home directory. Again, I can only speak from a Linux perspective. But the `$JAVA_HOME` environment variable was depreciated years ago by most distributions. This might not be the best way to find out but it works. + +```bash +# Bash +echo $(dirname $(readlink -f $(which javac))) +``` +```fish +# fish +echo (dirname (dirname (readlink -f (which javac)))) +``` + +From the directory we get with these queuries we need to go up one directory and then into a other directory. In the end the path we want to build should look something like this. The second one will obviously be different depending on your platform. + +``` +/usr/lib/jvm/java-8-openjdk-amd64/bin/../include +/usr/lib/jvm/java-8-openjdk-amd64/bin/../include/linux +``` + diff --git a/develop_server.sh b/develop_server.sh new file mode 100755 index 0000000..ae8f29e --- /dev/null +++ b/develop_server.sh @@ -0,0 +1,103 @@ +#!/usr/bin/env bash +## +# This section should match your Makefile +## +PY=${PY:-python3} +PELICAN=${PELICAN:-pelican} +PELICANOPTS= + +BASEDIR=$(pwd) +INPUTDIR=$BASEDIR/content +OUTPUTDIR=$BASEDIR/output +CONFFILE=$BASEDIR/pelicanconf.py + +### +# Don't change stuff below here unless you are sure +### + +SRV_PID=$BASEDIR/srv.pid +PELICAN_PID=$BASEDIR/pelican.pid + +function usage(){ + echo "usage: $0 (stop) (start) (restart) [port]" + echo "This starts Pelican in debug and reload mode and then launches" + echo "an HTTP server to help site development. It doesn't read" + echo "your Pelican settings, so if you edit any paths in your Makefile" + echo "you will need to edit your settings as well." + exit 3 +} + +function alive() { + kill -0 $1 >/dev/null 2>&1 +} + +function shut_down(){ + PID=$(cat $SRV_PID) + if [[ $? -eq 0 ]]; then + if alive $PID; then + echo "Stopping HTTP server" + kill $PID + else + echo "Stale PID, deleting" + fi + rm $SRV_PID + else + echo "HTTP server PIDFile not found" + fi + + PID=$(cat $PELICAN_PID) + if [[ $? -eq 0 ]]; then + if alive $PID; then + echo "Killing Pelican" + kill $PID + else + echo "Stale PID, deleting" + fi + rm $PELICAN_PID + else + echo "Pelican PIDFile not found" + fi +} + +function start_up(){ + local port=$1 + echo "Starting up Pelican and HTTP server" + shift + $PELICAN --debug --autoreload -r $INPUTDIR -o $OUTPUTDIR -s $CONFFILE $PELICANOPTS & + pelican_pid=$! + echo $pelican_pid > $PELICAN_PID + cd $OUTPUTDIR + $PY -m pelican.server $port & + srv_pid=$! + echo $srv_pid > $SRV_PID + cd $BASEDIR + sleep 1 + if ! alive $pelican_pid ; then + echo "Pelican didn't start. Is the Pelican package installed?" + return 1 + elif ! alive $srv_pid ; then + echo "The HTTP server didn't start. Is there another service using port" $port "?" + return 1 + fi + echo 'Pelican and HTTP server processes now running in background.' +} + +### +# MAIN +### +[[ ($# -eq 0) || ($# -gt 2) ]] && usage +port='' +[[ $# -eq 2 ]] && port=$2 + +if [[ $1 == "stop" ]]; then + shut_down +elif [[ $1 == "restart" ]]; then + shut_down + start_up $port +elif [[ $1 == "start" ]]; then + if ! start_up $port; then + shut_down + fi +else + usage +fi diff --git a/fabfile.py b/fabfile.py new file mode 100755 index 0000000..d46a16e --- /dev/null +++ b/fabfile.py @@ -0,0 +1,94 @@ +from fabric.api import * +import fabric.contrib.project as project +import os +import shutil +import sys +import SocketServer + +from pelican.server import ComplexHTTPRequestHandler + +# Local path configuration (can be absolute or relative to fabfile) +env.deploy_path = 'output' +DEPLOY_PATH = env.deploy_path + +# Remote server configuration +production = 'spacekookie@lonelyrobot.io:22' +dest_path = '/var/www' + +# Rackspace Cloud Files configuration settings +env.cloudfiles_username = 'my_rackspace_username' +env.cloudfiles_api_key = 'my_rackspace_api_key' +env.cloudfiles_container = 'my_cloudfiles_container' + +# Github Pages configuration +env.github_pages_branch = "gh-pages" + +# Port for `serve` +PORT = 4000 + +def clean(): + """Remove generated files""" + if os.path.isdir(DEPLOY_PATH): + shutil.rmtree(DEPLOY_PATH) + os.makedirs(DEPLOY_PATH) + +def build(): + """Build local version of site""" + local('pelican -s pelicanconf.py') + +def rebuild(): + """`clean` then `build`""" + clean() + build() + +def regenerate(): + """Automatically regenerate site upon file modification""" + local('pelican -r -s pelicanconf.py') + +def serve(): + """Serve site at http://localhost:4000/""" + os.chdir(env.deploy_path) + + class AddressReuseTCPServer(SocketServer.TCPServer): + allow_reuse_address = True + + server = AddressReuseTCPServer(('', PORT), ComplexHTTPRequestHandler) + + sys.stderr.write('Serving on port {0} ...\n'.format(PORT)) + server.serve_forever() + +def reserve(): + """`build`, then `serve`""" + build() + serve() + +def preview(): + """Build production version of site""" + local('pelican -s publishconf.py') + +def cf_upload(): + """Publish to Rackspace Cloud Files""" + rebuild() + with lcd(DEPLOY_PATH): + local('swift -v -A https://auth.api.rackspacecloud.com/v1.0 ' + '-U {cloudfiles_username} ' + '-K {cloudfiles_api_key} ' + 'upload -c {cloudfiles_container} .'.format(**env)) + +@hosts(production) +def publish(): + """Publish to production via rsync""" + local('pelican -s publishconf.py') + project.rsync_project( + remote_dir=dest_path, + exclude=".DS_Store", + local_dir=DEPLOY_PATH.rstrip('/') + '/', + delete=True, + extra_opts='-c', + ) + +def gh_pages(): + """Publish to GitHub Pages""" + rebuild() + local("ghp-import -b {github_pages_branch} {deploy_path}".format(**env)) + local("git push origin {github_pages_branch}".format(**env)) diff --git a/pelicanconf.py b/pelicanconf.py new file mode 100755 index 0000000..54c96e2 --- /dev/null +++ b/pelicanconf.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- # +from __future__ import unicode_literals + +AUTHOR = 'Kate' +SITENAME = 'Fun Memory Violations' +SITEURL = '' +# DISQUS_SITENAME = 'katesnullpointers' + +THEME = 'nest' +# NEST_HEADER_IMAGES = 'banner_bg2x.png' + +EXTRA_PATH_METADATA = { + # 'robots.txt': {'path': 'robots.txt'}, + 'favicon.ico': {'path': 'favicon.ico'} +} + +PLUGIN_PATHS = ['plugins/',] +PLUGINS = ['summary', ] + +TEMPLATE_DEBUG = True +DEBUG = True + +PATH = 'content' +STATIC_PATHS = ['images', 'downloads', 'kookie.txt'] +SITE_LOGO = 'favicon.ico' +SUMMARY_MAX_LENGTH = 140 + +############################################# +############################################# + +# THEME = 'lazystrap' # Why doesn't this work? :( + +DEFAULT_CATEGORY = 'Dev Diary' +DEFAULT_DATE = 'fs' + +DISPLAY_CATEGORIES_ON_MENU = False +DISPLAY_PAGES_ON_MENU = False + +MENUITEMS = ( + ('Home', '/'), + ('Blog', '/blog/'), + # ('Guides', '/guides/'), + # ('Showcase', '/showcase/'), + ('About Me', '/about/'), +) + +ARTICLE_URL = '{category}/{slug}' +ARTICLE_SAVE_AS = '{category}/{slug}/index.html' + +PAGE_URL = '{slug}' +PAGE_SAVE_AS = '{slug}/index.html' + +CATEGORY_URL = '{slug}' +CATEGORY_SAVE_AS = '{slug}/index.html' + +TAG_URL = '{slug}' +TAG_SAVE_AS = '{slug}/index.html' + +############################################# +############################################# + +TIMEZONE = 'Europe/Berlin' +DEFAULT_LANG = 'en' +LOCALE = 'C' +DEFAULT_DATE_FORMAT = '%Y-%m-%d' + +# Feed generation is usually not desired when developing +FEED_ALL_ATOM = None +CATEGORY_FEED_ATOM = None +TRANSLATION_FEED_ATOM = None +AUTHOR_FEED_ATOM = None + +FEED_RSS = 'rss.xml' +CATEGORY_FEED_RSS = '%s/rss.xml' + + +JINJA_EXTENSIONS = ['webassets.ext.jinja2.AssetsExtension', 'jinja2.ext.with_'] +# Blogroll +# LINKS = (('Lonely Robot', 'http://www.lonelyrobot.io'), ) + +# Social widget +SOCIAL = (('Twitter', 'https://www.twitter.com/spacekookie'),('Github','https://www.github.com/spacekookie'),) + +DEFAULT_PAGINATION = 20 diff --git a/plugins/summary/Readme.rst b/plugins/summary/Readme.rst new file mode 100755 index 0000000..3aec268 --- /dev/null +++ b/plugins/summary/Readme.rst @@ -0,0 +1,53 @@ +Summary +------- + +This plugin allows easy, variable length summaries directly embedded into the +body of your articles. It introduces two new settings: ``SUMMARY_BEGIN_MARKER`` +and ``SUMMARY_END_MARKER``: strings which can be placed directly into an article +to mark the beginning and end of a summary. When found, the standard +``SUMMARY_MAX_LENGTH`` setting will be ignored. The markers themselves will also +be removed from your articles before they are published. The default values +are ``<!-- PELICAN_BEGIN_SUMMARY -->`` and ``<!-- PELICAN_END_SUMMARY -->``. +For example:: + + Title: My super title + Date: 2010-12-03 10:20 + Tags: thats, awesome + Category: yeah + Slug: my-super-post + Author: Alexis Metaireau + + This is the content of my super blog post. + <!-- PELICAN_END_SUMMARY --> + and this content occurs after the summary. + +Here, the summary is taken to be the first line of the post. Because no +beginning marker was found, it starts at the top of the body. It is possible +to leave out the end marker instead, in which case the summary will start at the +beginning marker and continue to the end of the body. + +The plugin also sets a ``has_summary`` attribute on every article. It is True +for articles with an explicitly-defined summary, and False otherwise. (It is +also False for an article truncated by ``SUMMARY_MAX_LENGTH``.) Your templates +can use this e.g. to add a link to the full text at the end of the summary. + +reST example +~~~~~~~~~~~~ + +Inserting the markers into a reStructuredText document makes use of the +comment directive, because raw HTML is automatically escaped. The reST equivalent of the above Markdown example looks like this:: + + My super title + ############## + + :date: 2010-12-03 10:20 + :tags: thats, awesome + :category: yeah + :slug: my-super-post + :author: Alexis Metaireau + + This is the content of my super blog post. + + .. PELICAN_END_SUMMARY + + and this content occurs after the summary. diff --git a/plugins/summary/__init__.py b/plugins/summary/__init__.py new file mode 100755 index 0000000..afe9311 --- /dev/null +++ b/plugins/summary/__init__.py @@ -0,0 +1 @@ +from .summary import * diff --git a/plugins/summary/__pycache__/__init__.cpython-36.pyc b/plugins/summary/__pycache__/__init__.cpython-36.pyc Binary files differnew file mode 100644 index 0000000..a017b5d --- /dev/null +++ b/plugins/summary/__pycache__/__init__.cpython-36.pyc diff --git a/plugins/summary/__pycache__/summary.cpython-36.pyc b/plugins/summary/__pycache__/summary.cpython-36.pyc Binary files differnew file mode 100644 index 0000000..690703c --- /dev/null +++ b/plugins/summary/__pycache__/summary.cpython-36.pyc diff --git a/plugins/summary/summary.py b/plugins/summary/summary.py new file mode 100755 index 0000000..365f08f --- /dev/null +++ b/plugins/summary/summary.py @@ -0,0 +1,90 @@ +""" +Summary +------- + +This plugin allows easy, variable length summaries directly embedded into the +body of your articles. +""" + +from __future__ import unicode_literals +from pelican import signals +from pelican.generators import ArticlesGenerator, StaticGenerator, PagesGenerator + +def initialized(pelican): + from pelican.settings import DEFAULT_CONFIG + DEFAULT_CONFIG.setdefault('SUMMARY_BEGIN_MARKER', + '<!-- PELICAN_BEGIN_SUMMARY -->') + DEFAULT_CONFIG.setdefault('SUMMARY_END_MARKER', + '<!-- PELICAN_END_SUMMARY -->') + if pelican: + pelican.settings.setdefault('SUMMARY_BEGIN_MARKER', + '<!-- PELICAN_BEGIN_SUMMARY -->') + pelican.settings.setdefault('SUMMARY_END_MARKER', + '<!-- PELICAN_END_SUMMARY -->') + +def extract_summary(instance): + # if summary is already specified, use it + # if there is no content, there's nothing to do + if hasattr(instance, '_summary'): + instance.has_summary = True + return + + if not instance._content: + instance.has_summary = False + return + + begin_marker = instance.settings['SUMMARY_BEGIN_MARKER'] + end_marker = instance.settings['SUMMARY_END_MARKER'] + + content = instance._content + begin_summary = -1 + end_summary = -1 + if begin_marker: + begin_summary = content.find(begin_marker) + if end_marker: + end_summary = content.find(end_marker) + + if begin_summary == -1 and end_summary == -1: + instance.has_summary = False + return + + # skip over the begin marker, if present + if begin_summary == -1: + begin_summary = 0 + else: + begin_summary = begin_summary + len(begin_marker) + + if end_summary == -1: + end_summary = None + + summary = content[begin_summary:end_summary] + + # remove the markers from the content + if begin_summary: + content = content.replace(begin_marker, '', 1) + if end_summary: + content = content.replace(end_marker, '', 1) + + instance._content = content + instance._summary = summary + instance.has_summary = True + + +def run_plugin(generators): + for generator in generators: + if isinstance(generator, ArticlesGenerator): + for article in generator.articles: + extract_summary(article) + elif isinstance(generator, PagesGenerator): + for page in generator.pages: + extract_summary(page) + + +def register(): + signals.initialized.connect(initialized) + try: + signals.all_generators_finalized.connect(run_plugin) + except AttributeError: + # NOTE: This results in #314 so shouldn't really be relied on + # https://github.com/getpelican/pelican-plugins/issues/314 + signals.content_object_init.connect(extract_summary) diff --git a/plugins/summary/test_summary.py b/plugins/summary/test_summary.py new file mode 100755 index 0000000..c995106 --- /dev/null +++ b/plugins/summary/test_summary.py @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- + +import unittest + +from jinja2.utils import generate_lorem_ipsum + +# generate one paragraph, enclosed with <p> +TEST_CONTENT = str(generate_lorem_ipsum(n=1)) +TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False) + + +from pelican.contents import Page + +import summary + +class TestSummary(unittest.TestCase): + def setUp(self): + super(TestSummary, self).setUp() + + summary.register() + summary.initialized(None) + self.page_kwargs = { + 'content': TEST_CONTENT, + 'context': { + 'localsiteurl': '', + }, + 'metadata': { + 'summary': TEST_SUMMARY, + 'title': 'foo bar', + 'author': 'Blogger', + }, + } + + def _copy_page_kwargs(self): + # make a deep copy of page_kwargs + page_kwargs = dict([(key, self.page_kwargs[key]) for key in + self.page_kwargs]) + for key in page_kwargs: + if not isinstance(page_kwargs[key], dict): + break + page_kwargs[key] = dict([(subkey, page_kwargs[key][subkey]) + for subkey in page_kwargs[key]]) + + return page_kwargs + + def test_end_summary(self): + page_kwargs = self._copy_page_kwargs() + del page_kwargs['metadata']['summary'] + page_kwargs['content'] = ( + TEST_SUMMARY + '<!-- PELICAN_END_SUMMARY -->' + TEST_CONTENT) + page = Page(**page_kwargs) + # test both the summary and the marker removal + self.assertEqual(page.summary, TEST_SUMMARY) + self.assertEqual(page.content, TEST_SUMMARY + TEST_CONTENT) + + def test_begin_summary(self): + page_kwargs = self._copy_page_kwargs() + del page_kwargs['metadata']['summary'] + page_kwargs['content'] = ( + 'FOOBAR<!-- PELICAN_BEGIN_SUMMARY -->' + TEST_CONTENT) + page = Page(**page_kwargs) + # test both the summary and the marker removal + self.assertEqual(page.summary, TEST_CONTENT) + self.assertEqual(page.content, 'FOOBAR' + TEST_CONTENT) + + def test_begin_end_summary(self): + page_kwargs = self._copy_page_kwargs() + del page_kwargs['metadata']['summary'] + page_kwargs['content'] = ( + 'FOOBAR<!-- PELICAN_BEGIN_SUMMARY -->' + TEST_SUMMARY + + '<!-- PELICAN_END_SUMMARY -->' + TEST_CONTENT) + page = Page(**page_kwargs) + # test both the summary and the marker removal + self.assertEqual(page.summary, TEST_SUMMARY) + self.assertEqual(page.content, 'FOOBAR' + TEST_SUMMARY + TEST_CONTENT) diff --git a/publishconf.py b/publishconf.py new file mode 100755 index 0000000..d3cabcb --- /dev/null +++ b/publishconf.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- # +from __future__ import unicode_literals + +# This file is only used if you use `make publish` or +# explicitly specify it as your config file. + +import os +import sys +sys.path.append(os.curdir) +from pelicanconf import * + +SITEURL = 'https://spacekookie.de' +RELATIVE_URLS = False + +FEED_ALL_ATOM = 'feeds/all.atom.xml' +CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml' + +DELETE_OUTPUT_DIRECTORY = True + +# Following items are often useful when publishing + +# DISQUS_SITENAME = "katesnullpointers" +# GOOGLE_ANALYTICS = "" diff --git a/static/fonts/opensans-02a7f5c491cda3d79832291d9f0903a1086ad308.woff2 b/static/fonts/opensans-02a7f5c491cda3d79832291d9f0903a1086ad308.woff2 Binary files differdeleted file mode 100755 index f158de0..0000000 --- a/static/fonts/opensans-02a7f5c491cda3d79832291d9f0903a1086ad308.woff2 +++ /dev/null diff --git a/static/fonts/opensans-0780068aad6429b678dbfc89a831016b16efa340.woff2 b/static/fonts/opensans-0780068aad6429b678dbfc89a831016b16efa340.woff2 Binary files differdeleted file mode 100755 index e32e0b8..0000000 --- a/static/fonts/opensans-0780068aad6429b678dbfc89a831016b16efa340.woff2 +++ /dev/null diff --git a/static/fonts/opensans-082d935809ff8624c407f5ebfa9f707031f6871d.woff2 b/static/fonts/opensans-082d935809ff8624c407f5ebfa9f707031f6871d.woff2 Binary files differdeleted file mode 100755 index 68c5c23..0000000 --- a/static/fonts/opensans-082d935809ff8624c407f5ebfa9f707031f6871d.woff2 +++ /dev/null diff --git a/static/fonts/opensans-0843ae9e7843eae6a72c5b8f28d4dd6e5106f516.woff2 b/static/fonts/opensans-0843ae9e7843eae6a72c5b8f28d4dd6e5106f516.woff2 Binary files differdeleted file mode 100755 index f64b4f5..0000000 --- a/static/fonts/opensans-0843ae9e7843eae6a72c5b8f28d4dd6e5106f516.woff2 +++ /dev/null diff --git a/static/fonts/opensans-101147f1175d6b5ffc2f79f8a3f64a0d7f94e418.woff2 b/static/fonts/opensans-101147f1175d6b5ffc2f79f8a3f64a0d7f94e418.woff2 Binary files differdeleted file mode 100755 index 3af6f29..0000000 --- a/static/fonts/opensans-101147f1175d6b5ffc2f79f8a3f64a0d7f94e418.woff2 +++ /dev/null diff --git a/static/fonts/opensans-14a380d9ddfdee7aecf38c241c450bfe813d94e5.woff2 b/static/fonts/opensans-14a380d9ddfdee7aecf38c241c450bfe813d94e5.woff2 Binary files differdeleted file mode 100755 index 90b828f..0000000 --- a/static/fonts/opensans-14a380d9ddfdee7aecf38c241c450bfe813d94e5.woff2 +++ /dev/null diff --git a/static/fonts/opensans-1771169127bd9e07adbb7c767f2804f20ab73745.woff2 b/static/fonts/opensans-1771169127bd9e07adbb7c767f2804f20ab73745.woff2 Binary files differdeleted file mode 100755 index 0999dff..0000000 --- a/static/fonts/opensans-1771169127bd9e07adbb7c767f2804f20ab73745.woff2 +++ /dev/null diff --git a/static/fonts/opensans-231fcd661359bf887f4f24566723a0d640c015ad.woff2 b/static/fonts/opensans-231fcd661359bf887f4f24566723a0d640c015ad.woff2 Binary files differdeleted file mode 100755 index b708415..0000000 --- a/static/fonts/opensans-231fcd661359bf887f4f24566723a0d640c015ad.woff2 +++ /dev/null diff --git a/static/fonts/opensans-256fc89d0e1b746440955b22d1792532cd9c8b28.woff2 b/static/fonts/opensans-256fc89d0e1b746440955b22d1792532cd9c8b28.woff2 Binary files differdeleted file mode 100755 index 2da750a..0000000 --- a/static/fonts/opensans-256fc89d0e1b746440955b22d1792532cd9c8b28.woff2 +++ /dev/null diff --git a/static/fonts/opensans-257209387d9006aad15c25e62a999102d74e2d34.ttf b/static/fonts/opensans-257209387d9006aad15c25e62a999102d74e2d34.ttf Binary files differdeleted file mode 100755 index dd8784f..0000000 --- a/static/fonts/opensans-257209387d9006aad15c25e62a999102d74e2d34.ttf +++ /dev/null diff --git a/static/fonts/opensans-30e035a07a13db060570f5382a749e6150963c7d.woff2 b/static/fonts/opensans-30e035a07a13db060570f5382a749e6150963c7d.woff2 Binary files differdeleted file mode 100755 index 192dba8..0000000 --- a/static/fonts/opensans-30e035a07a13db060570f5382a749e6150963c7d.woff2 +++ /dev/null diff --git a/static/fonts/opensans-3601b8c8df77687232aa48455f95585cd02a1c20.woff2 b/static/fonts/opensans-3601b8c8df77687232aa48455f95585cd02a1c20.woff2 Binary files differdeleted file mode 100755 index 94763e4..0000000 --- a/static/fonts/opensans-3601b8c8df77687232aa48455f95585cd02a1c20.woff2 +++ /dev/null diff --git a/static/fonts/opensans-3823779db9f51a34658809ce66bdd6ed1145ed8e.ttf b/static/fonts/opensans-3823779db9f51a34658809ce66bdd6ed1145ed8e.ttf Binary files differdeleted file mode 100755 index 716735b..0000000 --- a/static/fonts/opensans-3823779db9f51a34658809ce66bdd6ed1145ed8e.ttf +++ /dev/null diff --git a/static/fonts/opensans-38448be4db4d82e2ccf22e2527f6e7831b053b30.woff2 b/static/fonts/opensans-38448be4db4d82e2ccf22e2527f6e7831b053b30.woff2 Binary files differdeleted file mode 100755 index 992a7c2..0000000 --- a/static/fonts/opensans-38448be4db4d82e2ccf22e2527f6e7831b053b30.woff2 +++ /dev/null diff --git a/static/fonts/opensans-3a9baf0916be2f57d8dc0edb6ac1d62584613628.woff2 b/static/fonts/opensans-3a9baf0916be2f57d8dc0edb6ac1d62584613628.woff2 Binary files differdeleted file mode 100755 index be745bd..0000000 --- a/static/fonts/opensans-3a9baf0916be2f57d8dc0edb6ac1d62584613628.woff2 +++ /dev/null diff --git a/static/fonts/opensans-3cd7287c1f241c0bd6df553af45ef1459dea2a29.woff2 b/static/fonts/opensans-3cd7287c1f241c0bd6df553af45ef1459dea2a29.woff2 Binary files differdeleted file mode 100755 index 38870b8..0000000 --- a/static/fonts/opensans-3cd7287c1f241c0bd6df553af45ef1459dea2a29.woff2 +++ /dev/null diff --git a/static/fonts/opensans-3d488e790bbea9ba0975ddd77ad8378510caee01.woff2 b/static/fonts/opensans-3d488e790bbea9ba0975ddd77ad8378510caee01.woff2 Binary files differdeleted file mode 100755 index 7960498..0000000 --- a/static/fonts/opensans-3d488e790bbea9ba0975ddd77ad8378510caee01.woff2 +++ /dev/null diff --git a/static/fonts/opensans-42286008c766c2fa87d1b3dfa90d8d9f273e580a.woff2 b/static/fonts/opensans-42286008c766c2fa87d1b3dfa90d8d9f273e580a.woff2 Binary files differdeleted file mode 100755 index c9e176d..0000000 --- a/static/fonts/opensans-42286008c766c2fa87d1b3dfa90d8d9f273e580a.woff2 +++ /dev/null diff --git a/static/fonts/opensans-4b163b622b3cfc64eacdb3a24f485d58be1bdbae.woff2 b/static/fonts/opensans-4b163b622b3cfc64eacdb3a24f485d58be1bdbae.woff2 Binary files differdeleted file mode 100755 index 7b9b4cb..0000000 --- a/static/fonts/opensans-4b163b622b3cfc64eacdb3a24f485d58be1bdbae.woff2 +++ /dev/null diff --git a/static/fonts/opensans-510e65d731654fda529690b06e382db085b612e3.woff2 b/static/fonts/opensans-510e65d731654fda529690b06e382db085b612e3.woff2 Binary files differdeleted file mode 100755 index 8bd93c8..0000000 --- a/static/fonts/opensans-510e65d731654fda529690b06e382db085b612e3.woff2 +++ /dev/null diff --git a/static/fonts/opensans-5147015c86d27c3dce7724fc177e7543eda86c0d.woff2 b/static/fonts/opensans-5147015c86d27c3dce7724fc177e7543eda86c0d.woff2 Binary files differdeleted file mode 100755 index 986fc56..0000000 --- a/static/fonts/opensans-5147015c86d27c3dce7724fc177e7543eda86c0d.woff2 +++ /dev/null diff --git a/static/fonts/opensans-57690d9bdac0b609a7a309afa66d228213b7967a.woff2 b/static/fonts/opensans-57690d9bdac0b609a7a309afa66d228213b7967a.woff2 Binary files differdeleted file mode 100755 index f4b0149..0000000 --- a/static/fonts/opensans-57690d9bdac0b609a7a309afa66d228213b7967a.woff2 +++ /dev/null diff --git a/static/fonts/opensans-58f09077c668b82398e90f3104c01a9bdf3b3b40.woff2 b/static/fonts/opensans-58f09077c668b82398e90f3104c01a9bdf3b3b40.woff2 Binary files differdeleted file mode 100755 index 6ca3d2f..0000000 --- a/static/fonts/opensans-58f09077c668b82398e90f3104c01a9bdf3b3b40.woff2 +++ /dev/null diff --git a/static/fonts/opensans-5d011e60828f77f264c3305324cd6179e74d59ab.woff2 b/static/fonts/opensans-5d011e60828f77f264c3305324cd6179e74d59ab.woff2 Binary files differdeleted file mode 100755 index 4bea884..0000000 --- a/static/fonts/opensans-5d011e60828f77f264c3305324cd6179e74d59ab.woff2 +++ /dev/null diff --git a/static/fonts/opensans-5d71d1757bb745b55a9eb47f628062753cb5b58c.woff2 b/static/fonts/opensans-5d71d1757bb745b55a9eb47f628062753cb5b58c.woff2 Binary files differdeleted file mode 100755 index bff235a..0000000 --- a/static/fonts/opensans-5d71d1757bb745b55a9eb47f628062753cb5b58c.woff2 +++ /dev/null diff --git a/static/fonts/opensans-6058911ac41968c2164c6a3ba59cc884939c2511.woff2 b/static/fonts/opensans-6058911ac41968c2164c6a3ba59cc884939c2511.woff2 Binary files differdeleted file mode 100755 index e6afd74..0000000 --- a/static/fonts/opensans-6058911ac41968c2164c6a3ba59cc884939c2511.woff2 +++ /dev/null diff --git a/static/fonts/opensans-618b78a8f6ffe7e1998eab67268859e2ab54be8e.ttf b/static/fonts/opensans-618b78a8f6ffe7e1998eab67268859e2ab54be8e.ttf Binary files differdeleted file mode 100755 index dd5091f..0000000 --- a/static/fonts/opensans-618b78a8f6ffe7e1998eab67268859e2ab54be8e.ttf +++ /dev/null diff --git a/static/fonts/opensans-6430a52dab446fc805d3f5b1221bf9a38e154d3b.woff2 b/static/fonts/opensans-6430a52dab446fc805d3f5b1221bf9a38e154d3b.woff2 Binary files differdeleted file mode 100755 index c6b4eb8..0000000 --- a/static/fonts/opensans-6430a52dab446fc805d3f5b1221bf9a38e154d3b.woff2 +++ /dev/null diff --git a/static/fonts/opensans-6aa866c008a8bb532458b049ab255945e286940a.woff2 b/static/fonts/opensans-6aa866c008a8bb532458b049ab255945e286940a.woff2 Binary files differdeleted file mode 100755 index 85b1f3a..0000000 --- a/static/fonts/opensans-6aa866c008a8bb532458b049ab255945e286940a.woff2 +++ /dev/null diff --git a/static/fonts/opensans-6c118f4639d3ee03a0c1cce2a6047ccb5e4b6dac.woff2 b/static/fonts/opensans-6c118f4639d3ee03a0c1cce2a6047ccb5e4b6dac.woff2 Binary files differdeleted file mode 100755 index 9ab88e2..0000000 --- a/static/fonts/opensans-6c118f4639d3ee03a0c1cce2a6047ccb5e4b6dac.woff2 +++ /dev/null diff --git a/static/fonts/opensans-6cd331cfa6a58dd852a22e42276a2dd2e1445ae6.woff2 b/static/fonts/opensans-6cd331cfa6a58dd852a22e42276a2dd2e1445ae6.woff2 Binary files differdeleted file mode 100755 index e03e125..0000000 --- a/static/fonts/opensans-6cd331cfa6a58dd852a22e42276a2dd2e1445ae6.woff2 +++ /dev/null diff --git a/static/fonts/opensans-797e92ab741300e5bd43f45ae934f2b2a7b137e6.woff2 b/static/fonts/opensans-797e92ab741300e5bd43f45ae934f2b2a7b137e6.woff2 Binary files differdeleted file mode 100755 index c40e78c..0000000 --- a/static/fonts/opensans-797e92ab741300e5bd43f45ae934f2b2a7b137e6.woff2 +++ /dev/null diff --git a/static/fonts/opensans-808769b38614943b5116b559ac7528386b7cb020.woff2 b/static/fonts/opensans-808769b38614943b5116b559ac7528386b7cb020.woff2 Binary files differdeleted file mode 100755 index 7e5e42c..0000000 --- a/static/fonts/opensans-808769b38614943b5116b559ac7528386b7cb020.woff2 +++ /dev/null diff --git a/static/fonts/opensans-829b0eefbb7ba0be775b7d741d0c41978a20a481.eot b/static/fonts/opensans-829b0eefbb7ba0be775b7d741d0c41978a20a481.eot Binary files differdeleted file mode 100755 index 89f2b56..0000000 --- a/static/fonts/opensans-829b0eefbb7ba0be775b7d741d0c41978a20a481.eot +++ /dev/null diff --git a/static/fonts/opensans-85e3ce3d35d4e067d1f533d1aab7a8e0ee51a963.woff2 b/static/fonts/opensans-85e3ce3d35d4e067d1f533d1aab7a8e0ee51a963.woff2 Binary files differdeleted file mode 100755 index 582bb5a..0000000 --- a/static/fonts/opensans-85e3ce3d35d4e067d1f533d1aab7a8e0ee51a963.woff2 +++ /dev/null diff --git a/static/fonts/opensans-8ed28b622974c995298647854f054668863021d1.woff2 b/static/fonts/opensans-8ed28b622974c995298647854f054668863021d1.woff2 Binary files differdeleted file mode 100755 index 9062341..0000000 --- a/static/fonts/opensans-8ed28b622974c995298647854f054668863021d1.woff2 +++ /dev/null diff --git a/static/fonts/opensans-92d2e645589fad0f22b789b050928dea5db6bc3b.woff2 b/static/fonts/opensans-92d2e645589fad0f22b789b050928dea5db6bc3b.woff2 Binary files differdeleted file mode 100755 index af7eeb8..0000000 --- a/static/fonts/opensans-92d2e645589fad0f22b789b050928dea5db6bc3b.woff2 +++ /dev/null diff --git a/static/fonts/opensans-95486a9c61867ecd4b703703ff4343306c16e03b.woff2 b/static/fonts/opensans-95486a9c61867ecd4b703703ff4343306c16e03b.woff2 Binary files differdeleted file mode 100755 index 2251230..0000000 --- a/static/fonts/opensans-95486a9c61867ecd4b703703ff4343306c16e03b.woff2 +++ /dev/null diff --git a/static/fonts/opensans-95618ec1cef0a5becd89ad80bff3d140a358b6ad.woff2 b/static/fonts/opensans-95618ec1cef0a5becd89ad80bff3d140a358b6ad.woff2 Binary files differdeleted file mode 100755 index 712a2ec..0000000 --- a/static/fonts/opensans-95618ec1cef0a5becd89ad80bff3d140a358b6ad.woff2 +++ /dev/null diff --git a/static/fonts/opensans-9ead99d8fbb79a1f78c2ed07bc1f1aee1e4866ba.woff2 b/static/fonts/opensans-9ead99d8fbb79a1f78c2ed07bc1f1aee1e4866ba.woff2 Binary files differdeleted file mode 100755 index 002f30d..0000000 --- a/static/fonts/opensans-9ead99d8fbb79a1f78c2ed07bc1f1aee1e4866ba.woff2 +++ /dev/null diff --git a/static/fonts/opensans-9ee51d47218830874fc05f4a0c1970392608ede0.woff2 b/static/fonts/opensans-9ee51d47218830874fc05f4a0c1970392608ede0.woff2 Binary files differdeleted file mode 100755 index 70edb3d..0000000 --- a/static/fonts/opensans-9ee51d47218830874fc05f4a0c1970392608ede0.woff2 +++ /dev/null diff --git a/static/fonts/opensans-a590b0edc76d8942dd06ba85279414d91af85f43.woff2 b/static/fonts/opensans-a590b0edc76d8942dd06ba85279414d91af85f43.woff2 Binary files differdeleted file mode 100755 index db7478a..0000000 --- a/static/fonts/opensans-a590b0edc76d8942dd06ba85279414d91af85f43.woff2 +++ /dev/null diff --git a/static/fonts/opensans-a824a9f6a32d64bcd79534ad310703b5ff94d24e.woff2 b/static/fonts/opensans-a824a9f6a32d64bcd79534ad310703b5ff94d24e.woff2 Binary files differdeleted file mode 100755 index ee5c461..0000000 --- a/static/fonts/opensans-a824a9f6a32d64bcd79534ad310703b5ff94d24e.woff2 +++ /dev/null diff --git a/static/fonts/opensans-aeac2c6d52f83f11761dad079a4b4ce67b1985ed.woff2 b/static/fonts/opensans-aeac2c6d52f83f11761dad079a4b4ce67b1985ed.woff2 Binary files differdeleted file mode 100755 index 5a32e3c..0000000 --- a/static/fonts/opensans-aeac2c6d52f83f11761dad079a4b4ce67b1985ed.woff2 +++ /dev/null diff --git a/static/fonts/opensans-af9bb31cbe924f6f4742cda969cfa46ee92bdb8a.ttf b/static/fonts/opensans-af9bb31cbe924f6f4742cda969cfa46ee92bdb8a.ttf Binary files differdeleted file mode 100755 index d74266e..0000000 --- a/static/fonts/opensans-af9bb31cbe924f6f4742cda969cfa46ee92bdb8a.ttf +++ /dev/null diff --git a/static/fonts/opensans-b3601a97e762646a1e17e821ac947646a686f38d.woff2 b/static/fonts/opensans-b3601a97e762646a1e17e821ac947646a686f38d.woff2 Binary files differdeleted file mode 100755 index 64de695..0000000 --- a/static/fonts/opensans-b3601a97e762646a1e17e821ac947646a686f38d.woff2 +++ /dev/null diff --git a/static/fonts/opensans-b606fc8cefcb8c9b9e11cd25c3d04864893a5651.woff2 b/static/fonts/opensans-b606fc8cefcb8c9b9e11cd25c3d04864893a5651.woff2 Binary files differdeleted file mode 100755 index 883ece5..0000000 --- a/static/fonts/opensans-b606fc8cefcb8c9b9e11cd25c3d04864893a5651.woff2 +++ /dev/null diff --git a/static/fonts/opensans-bae60a4ef6c2573e304d448d4478294c0ba7778f.woff2 b/static/fonts/opensans-bae60a4ef6c2573e304d448d4478294c0ba7778f.woff2 Binary files differdeleted file mode 100755 index 4c7d599..0000000 --- a/static/fonts/opensans-bae60a4ef6c2573e304d448d4478294c0ba7778f.woff2 +++ /dev/null diff --git a/static/fonts/opensans-c2a6cdc1dc4d57eef444571f285fd73ad164fdb1.woff2 b/static/fonts/opensans-c2a6cdc1dc4d57eef444571f285fd73ad164fdb1.woff2 Binary files differdeleted file mode 100755 index 3cf7688..0000000 --- a/static/fonts/opensans-c2a6cdc1dc4d57eef444571f285fd73ad164fdb1.woff2 +++ /dev/null diff --git a/static/fonts/opensans-cb44fe2b2923f938486e2c5f7f0fa7a00bbd24d2.ttf b/static/fonts/opensans-cb44fe2b2923f938486e2c5f7f0fa7a00bbd24d2.ttf Binary files differdeleted file mode 100755 index 8c381b1..0000000 --- a/static/fonts/opensans-cb44fe2b2923f938486e2c5f7f0fa7a00bbd24d2.ttf +++ /dev/null diff --git a/static/fonts/opensans-cc5e3ec30d0402200e3c1905a44ea5d37d543368.woff2 b/static/fonts/opensans-cc5e3ec30d0402200e3c1905a44ea5d37d543368.woff2 Binary files differdeleted file mode 100755 index e184f64..0000000 --- a/static/fonts/opensans-cc5e3ec30d0402200e3c1905a44ea5d37d543368.woff2 +++ /dev/null diff --git a/static/fonts/opensans-cc9bc768c595f045f6a31340c763c5e494e0ee0e.woff2 b/static/fonts/opensans-cc9bc768c595f045f6a31340c763c5e494e0ee0e.woff2 Binary files differdeleted file mode 100755 index 71cf98e..0000000 --- a/static/fonts/opensans-cc9bc768c595f045f6a31340c763c5e494e0ee0e.woff2 +++ /dev/null diff --git a/static/fonts/opensans-ccbe7ac33491ce00e73dd57ddfee63f24121bf4b.woff2 b/static/fonts/opensans-ccbe7ac33491ce00e73dd57ddfee63f24121bf4b.woff2 Binary files differdeleted file mode 100755 index bcb25b0..0000000 --- a/static/fonts/opensans-ccbe7ac33491ce00e73dd57ddfee63f24121bf4b.woff2 +++ /dev/null diff --git a/static/fonts/opensans-ce6f0578fc94b8e05a1eaf537c2587e938f2a158.woff2 b/static/fonts/opensans-ce6f0578fc94b8e05a1eaf537c2587e938f2a158.woff2 Binary files differdeleted file mode 100755 index 99cac81..0000000 --- a/static/fonts/opensans-ce6f0578fc94b8e05a1eaf537c2587e938f2a158.woff2 +++ /dev/null diff --git a/static/fonts/opensans-d0eeac030704f91d16e2201d107d7ee8a2c1dd2a.woff2 b/static/fonts/opensans-d0eeac030704f91d16e2201d107d7ee8a2c1dd2a.woff2 Binary files differdeleted file mode 100755 index 9cdebc4..0000000 --- a/static/fonts/opensans-d0eeac030704f91d16e2201d107d7ee8a2c1dd2a.woff2 +++ /dev/null diff --git a/static/fonts/opensans-d2f58eb442c4d4f47f2bf2950560a1e56ef02b76.woff2 b/static/fonts/opensans-d2f58eb442c4d4f47f2bf2950560a1e56ef02b76.woff2 Binary files differdeleted file mode 100755 index 4144f53..0000000 --- a/static/fonts/opensans-d2f58eb442c4d4f47f2bf2950560a1e56ef02b76.woff2 +++ /dev/null diff --git a/static/fonts/opensans-d4d19ed3a763ce10e050662542bc0318bb620096.svg b/static/fonts/opensans-d4d19ed3a763ce10e050662542bc0318bb620096.svg deleted file mode 100755 index 052c59f..0000000 --- a/static/fonts/opensans-d4d19ed3a763ce10e050662542bc0318bb620096.svg +++ /dev/null @@ -1,1637 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg xmlns="http://www.w3.org/2000/svg"> -<defs > -<font id="OpenSans" horiz-adv-x="1206" ><font-face - font-family="Open Sans" - units-per-em="2048" - panose-1="2 11 6 6 3 5 4 2 2 4" - ascent="2189" - descent="-600" - alphabetic="0" /> -<glyph unicode=" " glyph-name="space" horiz-adv-x="532" /> -<glyph unicode="!" glyph-name="exclam" horiz-adv-x="547" d="M326 403H221L170 1462H377L326 403ZM152 106Q152 242 272 242Q330 242 361 207T393 106Q393 42 361 7T272 -29Q220 -29 186 2T152 106Z" /> -<glyph unicode=""" glyph-name="quotedbl" horiz-adv-x="821" d="M319 1462L279 934H174L133 1462H319ZM688 1462L647 934H543L502 1462H688Z" /> -<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="1323" d="M981 899L915 559H1198V430H891L807 0H670L754 430H451L369 0H233L313 430H51V559H338L406 899H129V1026H428L510 1462H649L567 1026H872L956 1462H1090L1006 1026H1270V899H981ZM475 559H778L844 -899H541L475 559Z" /> -<glyph unicode="$" glyph-name="dollar" horiz-adv-x="1171" d="M1036 449Q1036 313 934 225T649 113V-119H520V104Q408 104 303 121T131 170V326Q214 289 322 266T520 242V682Q315 747 233 833T150 1055Q150 1186 251 1270T520 1372V1554H649V1374Q833 1369 1004 -1300L952 1169Q803 1228 649 1239V805Q806 755 884 708T999 599T1036 449ZM866 436Q866 508 822 552T649 641V252Q866 282 866 436ZM319 1057Q319 981 364 935T520 848V1235Q421 1219 370 1173T319 1057Z" /> -<glyph unicode="%" glyph-name="percent" horiz-adv-x="1686" d="M242 1026Q242 856 279 771T399 686Q563 686 563 1026Q563 1364 399 1364Q316 1364 279 1280T242 1026ZM700 1026Q700 798 624 682T399 565Q259 565 182 684T104 1026Q104 1253 178 1368T399 1483Q544 -1483 622 1364T700 1026ZM1122 440Q1122 269 1159 185T1280 100Q1364 100 1404 183T1444 440Q1444 611 1404 693T1280 776Q1196 776 1159 694T1122 440ZM1581 440Q1581 213 1505 97T1280 -20Q1138 -20 1062 99T985 440Q985 667 1059 782T1280 897Q1422 897 1501 -780T1581 440ZM1323 1462L512 0H365L1176 1462H1323Z" /> -<glyph unicode="&" glyph-name="ampersand" horiz-adv-x="1495" d="M414 1171Q414 1102 450 1040T573 889Q702 964 752 1027T803 1174Q803 1251 752 1299T614 1348Q525 1348 470 1300T414 1171ZM569 129Q810 129 969 283L532 707Q421 639 375 595T307 499T285 -383Q285 266 362 198T569 129ZM113 379Q113 509 182 609T432 811Q347 906 317 955T268 1057T250 1167Q250 1317 348 1401T621 1485Q783 1485 876 1402T969 1169Q969 1062 901 972T676 788L1083 397Q1139 459 1172 542T1229 725H1397Q1329 439 1192 291L1491 0H1262L1077 -178Q959 72 837 26T565 -20Q350 -20 232 86T113 379Z" /> -<glyph unicode="'" glyph-name="quotesingle" horiz-adv-x="453" d="M319 1462L279 934H174L133 1462H319Z" /> -<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="606" d="M82 561Q82 826 159 1057T383 1462H545Q401 1269 329 1038T256 563Q256 323 330 94T543 -324H383Q236 -154 159 73T82 561Z" /> -<glyph unicode=")" glyph-name="parenright" horiz-adv-x="606" d="M524 561Q524 298 447 71T223 -324H63Q202 -136 276 93T350 563Q350 807 278 1038T61 1462H223Q370 1287 447 1056T524 561Z" /> -<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="1130" d="M657 1556L614 1161L1012 1272L1038 1090L657 1059L905 733L733 639L557 1001L397 639L221 733L463 1059L86 1090L115 1272L506 1161L463 1556H657Z" /> -<glyph unicode="+" glyph-name="plus" horiz-adv-x="1171" d="M653 791H1065V653H653V227H514V653H104V791H514V1219H653V791Z" /> -<glyph unicode="," glyph-name="comma" horiz-adv-x="502" d="M350 238L365 215Q339 115 290 -17T188 -264H63Q90 -160 122 -7T168 238H350Z" /> -<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="659" d="M84 473V625H575V473H84Z" /> -<glyph unicode="." glyph-name="period" horiz-adv-x="545" d="M152 106Q152 173 182 207T270 242Q328 242 360 208T393 106Q393 41 360 6T270 -29Q219 -29 186 2T152 106Z" /> -<glyph unicode="/" glyph-name="slash" horiz-adv-x="752" d="M731 1462L186 0H20L565 1462H731Z" /> -<glyph unicode="0" glyph-name="zero" horiz-adv-x="1171" d="M1069 733Q1069 354 950 167T584 -20Q348 -20 225 171T102 733Q102 1115 221 1300T584 1485Q822 1485 945 1292T1069 733ZM270 733Q270 414 345 269T584 123Q750 123 824 270T899 733Q899 1048 825 -1194T584 1341Q420 1341 345 1197T270 733Z" /> -<glyph unicode="1" glyph-name="one" horiz-adv-x="1171" d="M715 0H553V1042Q553 1172 561 1288Q540 1267 514 1244T276 1049L188 1163L575 1462H715V0Z" /> -<glyph unicode="2" glyph-name="two" horiz-adv-x="1171" d="M1061 0H100V143L485 530Q661 708 717 784T801 932T829 1087Q829 1204 758 1272T561 1341Q470 1341 389 1311T207 1202L119 1315Q321 1483 559 1483Q765 1483 882 1378T999 1094Q999 955 921 819T629 -475L309 162V154H1061V0Z" /> -<glyph unicode="3" glyph-name="three" horiz-adv-x="1171" d="M1006 1118Q1006 978 928 889T705 770V762Q881 740 966 650T1051 414Q1051 205 906 93T494 -20Q378 -20 282 -3T94 59V217Q189 170 296 146T500 121Q879 121 879 418Q879 684 461 684H317V827H463Q634 -827 734 902T834 1112Q834 1219 761 1280T561 1341Q465 1341 380 1315T186 1219L102 1331Q192 1402 309 1442T557 1483Q770 1483 888 1386T1006 1118Z" /> -<glyph unicode="4" glyph-name="four" horiz-adv-x="1171" d="M1130 336H913V0H754V336H43V481L737 1470H913V487H1130V336ZM754 487V973Q754 1116 764 1296H756Q708 1200 666 1137L209 487H754Z" /> -<glyph unicode="5" glyph-name="five" horiz-adv-x="1171" d="M557 893Q788 893 920 779T1053 465Q1053 238 909 109T510 -20Q263 -20 133 59V219Q203 174 307 149T512 123Q688 123 785 206T883 446Q883 752 508 752Q413 752 254 723L168 778L223 1462H950V1309H365L328 -870Q443 893 557 893Z" /> -<glyph unicode="6" glyph-name="six" horiz-adv-x="1171" d="M117 625Q117 1056 284 1269T780 1483Q893 1483 958 1464V1321Q881 1346 782 1346Q547 1346 423 1200T287 739H299Q409 911 647 911Q844 911 957 792T1071 469Q1071 241 947 111T610 -20Q383 -20 250 -150T117 625ZM608 121Q750 121 828 210T907 469Q907 614 834 697T616 780Q526 780 451 743T332 641T287 506Q287 403 327 314T440 173T608 121Z" /> -<glyph unicode="7" glyph-name="seven" horiz-adv-x="1171" d="M285 0L891 1309H94V1462H1067V1329L469 0H285Z" /> -<glyph unicode="8" glyph-name="eight" horiz-adv-x="1171" d="M584 1483Q784 1483 901 1390T1018 1133Q1018 1025 951 936T737 774Q915 689 990 596T1065 379Q1065 197 938 89T590 -20Q356 -20 230 82T104 373Q104 624 410 764Q272 842 212 932T152 1135Q152 -1294 269 1388T584 1483ZM268 369Q268 249 351 182T586 115Q735 115 818 185T901 377Q901 474 823 549T551 696Q402 632 335 555T268 369ZM582 1348Q457 1348 386 1288T315 1128Q315 1036 374 970T592 838Q735 898 794 967T854 1128Q854 1229 782 1288T582 1348Z" -/> -<glyph unicode="9" glyph-name="nine" horiz-adv-x="1171" d="M1061 838Q1061 -20 397 -20Q281 -20 213 0V143Q293 117 395 117Q635 117 757 265T891 721H879Q824 638 733 595T528 551Q334 551 220 667T106 991Q106 1219 233 1351T569 1483Q718 1483 829 1407T1001 -1184T1061 838ZM569 1341Q426 1341 348 1249T270 993Q270 849 342 767T561 684Q652 684 728 721T849 822T893 956Q893 1061 852 1150T738 1290T569 1341Z" /> -<glyph unicode=":" glyph-name="colon" horiz-adv-x="545" d="M152 106Q152 173 182 207T270 242Q328 242 360 208T393 106Q393 41 360 6T270 -29Q219 -29 186 2T152 106ZM152 989Q152 1124 270 1124Q393 1124 393 989Q393 924 360 889T270 854Q219 854 186 885T152 989Z" /> -<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="545" d="M350 238L365 215Q339 115 290 -17T188 -264H63Q90 -160 122 -7T168 238H350ZM147 989Q147 1124 266 1124Q389 1124 389 989Q389 924 356 889T266 854Q208 854 178 889T147 989Z" /> -<glyph unicode="<" glyph-name="less" horiz-adv-x="1171" d="M1065 242L104 664V762L1065 1241V1092L283 721L1065 393V242Z" /> -<glyph unicode="=" glyph-name="equal" horiz-adv-x="1171" d="M119 858V995H1049V858H119ZM119 449V586H1049V449H119Z" /> -<glyph unicode=">" glyph-name="greater" horiz-adv-x="1171" d="M104 393L887 719L104 1092V1241L1065 762V664L104 242V393Z" /> -<glyph unicode="?" glyph-name="question" horiz-adv-x="879" d="M289 403V457Q289 574 325 649T459 809Q595 924 630 982T666 1122Q666 1224 601 1279T412 1335Q333 1335 258 1317T86 1249L27 1384Q216 1483 422 1483Q613 1483 719 1389T825 1124Q825 1051 806 -996T748 891T584 731Q483 645 451 588T418 436V403H289ZM240 106Q240 242 360 242Q418 242 449 207T481 106Q481 42 449 7T360 -29Q308 -29 274 2T240 106Z" /> -<glyph unicode="@" glyph-name="at" horiz-adv-x="1841" d="M1720 729Q1720 587 1676 469T1552 286T1368 221Q1282 221 1223 273T1153 406H1145Q1105 319 1031 270T854 221Q704 221 620 323T535 602Q535 806 653 933T963 1061Q1031 1061 1117 1049T1272 1014L1247 -544V522Q1247 344 1380 344Q1471 344 1528 451T1585 731Q1585 912 1511 1048T1301 1257T987 1331Q764 1331 599 1239T347 975T260 578Q260 273 421 109T885 -55Q1095 -55 1321 31V-102Q1129 -186 885 -186Q522 -186 322 13T121 571Q121 831 228 1034T533 1348T987 -1460Q1202 1460 1369 1370T1628 1113T1720 729ZM686 598Q686 344 881 344Q1088 344 1106 657L1120 918Q1048 938 963 938Q833 938 760 848T686 598Z" /> -<glyph unicode="A" glyph-name="A" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885Z" /> -<glyph unicode="B" glyph-name="B" horiz-adv-x="1327" d="M201 1462H614Q905 1462 1035 1375T1165 1100Q1165 970 1093 886T881 776V766Q1214 709 1214 416Q1214 220 1082 110T711 0H201V1462ZM371 836H651Q831 836 910 892T989 1083Q989 1206 901 1260T621 1315H371V836ZM371 -692V145H676Q853 145 942 213T1032 428Q1032 564 941 628T662 692H371Z" /> -<glyph unicode="C" glyph-name="C" horiz-adv-x="1292" d="M827 1331Q586 1331 447 1171T307 731Q307 444 441 288T825 131Q978 131 1174 186V37Q1022 -20 799 -20Q476 -20 301 176T125 733Q125 959 209 1129T453 1391T829 1483Q1059 1483 1231 1399L1159 1253Q993 -1331 827 1331Z" /> -<glyph unicode="D" glyph-name="D" horiz-adv-x="1493" d="M1368 745Q1368 383 1172 192T606 0H201V1462H649Q990 1462 1179 1273T1368 745ZM1188 739Q1188 1025 1045 1170T618 1315H371V147H578Q882 147 1035 296T1188 739Z" /> -<glyph unicode="E" glyph-name="E" horiz-adv-x="1139" d="M1016 0H201V1462H1016V1311H371V840H977V690H371V152H1016V0Z" /> -<glyph unicode="F" glyph-name="F" horiz-adv-x="1057" d="M371 0H201V1462H1016V1311H371V776H977V625H371V0Z" /> -<glyph unicode="G" glyph-name="G" horiz-adv-x="1491" d="M844 766H1341V55Q1225 18 1105 -1T827 -20Q495 -20 310 177T125 731Q125 959 216 1130T480 1392T883 1483Q1117 1483 1319 1397L1253 1247Q1055 1331 872 1331Q605 1331 455 1172T305 731Q305 435 449 -282T874 129Q1026 129 1171 164V614H844V766Z" /> -<glyph unicode="H" glyph-name="H" horiz-adv-x="1511" d="M1311 0H1141V688H371V0H201V1462H371V840H1141V1462H1311V0Z" /> -<glyph unicode="I" glyph-name="I" horiz-adv-x="571" d="M201 0V1462H371V0H201Z" /> -<glyph unicode="J" glyph-name="J" horiz-adv-x="547" d="M-12 -385Q-106 -385 -160 -358V-213Q-89 -233 -12 -233Q87 -233 138 -173T190 0V1462H360V14Q360 -176 264 -280T-12 -385Z" /> -<glyph unicode="K" glyph-name="K" horiz-adv-x="1257" d="M1257 0H1057L524 709L371 573V0H201V1462H371V737L1034 1462H1235L647 827L1257 0Z" /> -<glyph unicode="L" glyph-name="L" horiz-adv-x="1063" d="M201 0V1462H371V154H1016V0H201Z" /> -<glyph unicode="M" glyph-name="M" horiz-adv-x="1849" d="M848 0L352 1296H344Q358 1142 358 930V0H201V1462H457L920 256H928L1395 1462H1649V0H1479V942Q1479 1104 1493 1294H1485L985 0H848Z" /> -<glyph unicode="N" glyph-name="N" horiz-adv-x="1544" d="M1343 0H1149L350 1227H342Q358 1011 358 831V0H201V1462H393L1190 240H1198Q1196 267 1189 413T1184 623V1462H1343V0Z" /> -<glyph unicode="O" glyph-name="O" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290 733Q1290 1028 -1167 1180T801 1333Q558 1333 432 1180T305 733Z" /> -<glyph unicode="P" glyph-name="P" horiz-adv-x="1233" d="M1128 1036Q1128 814 977 695T543 575H371V0H201V1462H580Q1128 1462 1128 1036ZM371 721H524Q750 721 851 794T952 1028Q952 1173 857 1244T561 1315H371V721Z" /> -<glyph unicode="Q" glyph-name="Q" horiz-adv-x="1595" d="M1470 733Q1470 452 1357 266T1038 14L1386 -348H1139L854 -18L799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 -129 1166 282T1290 733Q1290 1028 1167 1180T801 1333Q558 1333 432 1180T305 733Z" /> -<glyph unicode="R" glyph-name="R" horiz-adv-x="1266" d="M371 608V0H201V1462H602Q871 1462 999 1359T1128 1049Q1128 759 834 657L1231 0H1030L676 608H371ZM371 754H604Q784 754 868 825T952 1040Q952 1185 867 1249T592 1313H371V754Z" /> -<glyph unicode="S" glyph-name="S" horiz-adv-x="1124" d="M1026 389Q1026 196 886 88T506 -20Q246 -20 106 47V211Q196 173 302 151T512 129Q682 129 768 193T854 373Q854 449 824 497T722 587T504 680Q300 753 213 853T125 1114Q125 1283 252 1383T588 1483Q806 -1483 989 1403L936 1255Q755 1331 584 1331Q449 1331 373 1273T297 1112Q297 1036 325 988T419 899T623 809Q853 727 939 633T1026 389Z" /> -<glyph unicode="T" glyph-name="T" horiz-adv-x="1133" d="M651 0H481V1311H18V1462H1114V1311H651V0Z" /> -<glyph unicode="U" glyph-name="U" horiz-adv-x="1491" d="M1305 1462V516Q1305 266 1154 123T739 -20Q475 -20 331 124T186 520V1462H356V508Q356 325 456 227T750 129Q935 129 1035 227T1135 510V1462H1305Z" /> -<glyph unicode="V" glyph-name="V" horiz-adv-x="1219" d="M1036 1462H1219L692 0H524L0 1462H180L516 516Q574 353 608 199Q644 361 702 522L1036 1462Z" /> -<glyph unicode="W" glyph-name="W" horiz-adv-x="1896" d="M1477 0H1309L1014 979Q993 1044 967 1143T940 1262Q918 1130 870 973L584 0H416L27 1462H207L438 559Q486 369 508 215Q535 398 588 573L850 1462H1030L1305 565Q1353 410 1386 215Q1405 357 1458 561L1688 -1462H1868L1477 0Z" /> -<glyph unicode="X" glyph-name="X" horiz-adv-x="1182" d="M1174 0H981L588 643L188 0H8L494 764L41 1462H229L592 883L958 1462H1139L686 770L1174 0Z" /> -<glyph unicode="Y" glyph-name="Y" horiz-adv-x="1147" d="M573 731L963 1462H1147L659 567V0H487V559L0 1462H186L573 731Z" /> -<glyph unicode="Z" glyph-name="Z" horiz-adv-x="1169" d="M1087 0H82V133L858 1309H106V1462H1065V1329L289 154H1087V0Z" /> -<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="674" d="M623 -324H166V1462H623V1321H334V-182H623V-324Z" /> -<glyph unicode="\" glyph-name="backslash" horiz-adv-x="752" d="M186 1462L733 0H567L23 1462H186Z" /> -<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="674" d="M51 -182H340V1321H51V1462H508V-324H51V-182Z" /> -<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="1110" d="M49 551L483 1473H582L1059 551H907L535 1296L201 551H49Z" /> -<glyph unicode="_" glyph-name="underscore" horiz-adv-x="918" d="M922 -315H-4V-184H922V-315Z" /> -<glyph unicode="`" glyph-name="grave" horiz-adv-x="1182" d="M786 1241H676Q611 1293 522 1389T393 1548V1569H596Q628 1500 685 1410T786 1266V1241Z" /> -<glyph unicode="a" glyph-name="a" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114 878 1027T973 -748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117Z" /> -<glyph unicode="b" glyph-name="b" horiz-adv-x="1255" d="M686 1114Q902 1114 1021 967T1141 549Q1141 279 1021 130T686 -20Q579 -20 491 19T342 141H330L295 0H176V1556H342V1178Q342 1051 334 950H342Q458 1114 686 1114ZM662 975Q492 975 417 878T342 549Q342 -318 419 219T666 119Q819 119 894 230T969 551Q969 765 894 870T662 975Z" /> -<glyph unicode="c" glyph-name="c" horiz-adv-x="975" d="M614 -20Q376 -20 246 126T115 541Q115 816 247 966T625 1116Q704 1116 783 1099T907 1059L856 918Q801 940 736 954T621 969Q287 969 287 543Q287 341 368 233T610 125Q747 125 891 184V37Q781 -20 614 -20Z" /> -<glyph unicode="d" glyph-name="d" horiz-adv-x="1255" d="M922 147H913Q798 -20 569 -20Q354 -20 235 127T115 545Q115 816 235 966T569 1116Q792 1116 911 954H924L917 1033L913 1110V1556H1079V0H944L922 147ZM590 119Q760 119 836 211T913 510V545Q913 778 -836 877T588 977Q442 977 365 864T287 543Q287 333 364 226T590 119Z" /> -<glyph unicode="e" glyph-name="e" horiz-adv-x="1149" d="M639 -20Q396 -20 256 128T115 539Q115 804 245 960T596 1116Q802 1116 922 981T1042 623V518H287Q292 325 384 225T645 125Q822 125 995 199V51Q907 13 829 -3T639 -20ZM594 977Q462 977 384 891T291 -653H864Q864 810 794 893T594 977Z" /> -<glyph unicode="f" glyph-name="f" horiz-adv-x="694" d="M670 967H391V0H225V967H29V1042L225 1102V1163Q225 1567 578 1567Q665 1567 782 1532L739 1399Q643 1430 575 1430Q481 1430 436 1368T391 1167V1096H670V967Z" /> -<glyph unicode="g" glyph-name="g" horiz-adv-x="1122" d="M1073 1096V991L870 967Q898 932 920 876T942 748Q942 587 832 491T530 395Q481 395 438 403Q332 347 332 262Q332 217 369 196T496 174H690Q868 174 963 99T1059 -119Q1059 -301 913 -396T487 -492Q272 --492 156 -412T39 -186Q39 -86 103 -13T283 86Q241 105 213 145T184 238Q184 298 216 343T317 430Q232 465 179 549T125 741Q125 921 233 1018T539 1116Q625 1116 694 1096H1073ZM199 -184Q199 -273 274 -319T489 -365Q698 -365 798 -303T899 -133Q899 -44 844 --10T637 25H438Q325 25 262 -29T199 -184ZM289 745Q289 630 354 571T535 512Q778 512 778 748Q778 995 532 995Q415 995 352 932T289 745Z" /> -<glyph unicode="h" glyph-name="h" horiz-adv-x="1257" d="M926 0V709Q926 843 865 909T674 975Q501 975 422 881T342 573V0H176V1556H342V1085Q342 1000 334 944H344Q393 1023 483 1068T690 1114Q891 1114 991 1019T1092 715V0H926Z" /> -<glyph unicode="i" glyph-name="i" horiz-adv-x="518" d="M342 0H176V1096H342V0ZM162 1393Q162 1450 190 1476T260 1503Q300 1503 329 1476T358 1393Q358 1337 329 1310T260 1282Q218 1282 190 1309T162 1393Z" /> -<glyph unicode="j" glyph-name="j" horiz-adv-x="518" d="M43 -492Q-52 -492 -111 -467V-332Q-42 -352 25 -352Q103 -352 139 -310T176 -180V1096H342V-168Q342 -492 43 -492ZM162 1393Q162 1450 190 1476T260 1503Q300 1503 329 1476T358 1393Q358 1337 329 1310T260 -1282Q218 1282 190 1309T162 1393Z" /> -<glyph unicode="k" glyph-name="k" horiz-adv-x="1075" d="M340 561Q383 622 471 721L825 1096H1022L578 629L1053 0H852L465 518L340 410V0H176V1556H340V731Q340 676 332 561H340Z" /> -<glyph unicode="l" glyph-name="l" horiz-adv-x="518" d="M342 0H176V1556H342V0Z" /> -<glyph unicode="m" glyph-name="m" horiz-adv-x="1905" d="M1573 0V713Q1573 844 1517 909T1343 975Q1188 975 1114 886T1040 612V0H874V713Q874 844 818 909T643 975Q487 975 415 882T342 575V0H176V1096H311L338 946H346Q393 1026 478 1071T670 1116Q927 1116 -1006 930H1014Q1063 1016 1156 1066T1368 1116Q1554 1116 1646 1021T1739 715V0H1573Z" /> -<glyph unicode="n" glyph-name="n" horiz-adv-x="1257" d="M926 0V709Q926 843 865 909T674 975Q502 975 422 882T342 575V0H176V1096H311L338 946H346Q397 1027 489 1071T694 1116Q892 1116 992 1021T1092 715V0H926Z" /> -<glyph unicode="o" glyph-name="o" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950 549Q950 758 866 -866T616 975Q453 975 370 868T287 549Z" /> -<glyph unicode="p" glyph-name="p" horiz-adv-x="1255" d="M686 -20Q579 -20 491 19T342 141H330Q342 45 342 -41V-492H176V1096H311L334 946H342Q406 1036 491 1076T686 1116Q904 1116 1022 967T1141 549Q1141 279 1021 130T686 -20ZM662 975Q494 975 419 882T342 -586V549Q342 318 419 219T666 119Q808 119 888 234T969 551Q969 756 889 865T662 975Z" /> -<glyph unicode="q" glyph-name="q" horiz-adv-x="1255" d="M590 119Q756 119 832 208T913 508V545Q913 775 835 876T588 977Q442 977 365 864T287 543Q287 336 363 228T590 119ZM565 -20Q353 -20 234 129T115 545Q115 814 235 965T569 1116Q794 1116 915 946H924L948 -1096H1079V-492H913V-23Q913 77 924 147H911Q796 -20 565 -20Z" /> -<glyph unicode="r" glyph-name="r" horiz-adv-x="836" d="M676 1116Q749 1116 807 1104L784 950Q716 965 664 965Q531 965 437 857T342 588V0H176V1096H313L332 893H340Q401 1000 487 1058T676 1116Z" /> -<glyph unicode="s" glyph-name="s" horiz-adv-x="977" d="M883 299Q883 146 769 63T449 -20Q231 -20 109 49V203Q188 163 278 140T453 117Q583 117 653 158T723 285Q723 349 668 394T451 502Q298 559 234 601T138 698T106 827Q106 961 215 1038T514 1116Q691 1116 -860 1044L801 909Q636 977 502 977Q384 977 324 940T264 838Q264 794 286 763T359 704T551 623Q746 552 814 480T883 299Z" /> -<glyph unicode="t" glyph-name="t" horiz-adv-x="723" d="M530 117Q574 117 615 123T680 137V10Q653 -3 601 -11T506 -20Q188 -20 188 315V967H31V1047L188 1116L258 1350H354V1096H672V967H354V322Q354 223 401 170T530 117Z" /> -<glyph unicode="u" glyph-name="u" horiz-adv-x="1257" d="M332 1096V385Q332 251 393 185T584 119Q756 119 835 213T915 520V1096H1081V0H944L920 147H911Q860 66 770 23T563 -20Q363 -20 264 75T164 379V1096H332Z" /> -<glyph unicode="v" glyph-name="v" horiz-adv-x="1026" d="M416 0L0 1096H178L414 446Q494 218 508 150H516Q527 203 585 369T848 1096H1026L610 0H416Z" /> -<glyph unicode="w" glyph-name="w" horiz-adv-x="1593" d="M1071 0L870 643Q851 702 799 911H791Q751 736 721 641L514 0H322L23 1096H197Q303 683 358 467T422 176H430Q441 233 465 323T508 467L709 1096H889L1085 467Q1141 295 1161 178H1169Q1173 214 1190 -289T1399 1096H1571L1268 0H1071Z" /> -<glyph unicode="x" glyph-name="x" horiz-adv-x="1073" d="M440 561L59 1096H248L537 676L825 1096H1012L631 561L1032 0H844L537 444L227 0H39L440 561Z" /> -<glyph unicode="y" glyph-name="y" horiz-adv-x="1032" d="M2 1096H180L420 471Q499 257 518 162H526Q539 213 580 336T852 1096H1030L559 -152Q489 -337 396 -414T166 -492Q90 -492 16 -475V-342Q71 -354 139 -354Q310 -354 383 -162L444 -6L2 1096Z" /> -<glyph unicode="z" glyph-name="z" horiz-adv-x="958" d="M877 0H82V113L680 967H119V1096H862V967L272 129H877V0Z" /> -<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="776" d="M475 12Q475 -90 533 -136T705 -184V-324Q515 -322 411 -237T307 2V305Q307 409 244 453T61 498V639Q191 641 249 687T307 829V1135Q307 1290 415 1376T705 1462V1323Q475 1317 475 1124V829Q475 -614 252 575V563Q475 524 475 309V12Z" /> -<glyph unicode="|" glyph-name="bar" horiz-adv-x="1128" d="M494 1556H635V-496H494V1556Z" /> -<glyph unicode="}" glyph-name="braceright" horiz-adv-x="776" d="M522 575Q299 614 299 829V1124Q299 1317 72 1323V1462Q256 1462 361 1375T467 1135V829Q467 732 526 687T715 639V498Q593 498 530 454T467 305V2Q467 -151 365 -236T72 -324V-184Q183 -182 -241 -136T299 12V309Q299 423 354 483T522 563V575Z" /> -<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="1171" d="M338 713Q285 713 222 680T104 592V743Q204 852 348 852Q416 852 472 838T618 786Q684 758 733 745T829 731Q883 731 947 763T1065 852V702Q963 592 821 592Q749 592 686 608T551 657Q476 689 -431 701T338 713Z" /> -<glyph unicode=" " glyph-name="nbspace" horiz-adv-x="532" /> -<glyph unicode="¡" glyph-name="exclamdown" horiz-adv-x="547" d="M219 684H324L375 -373H168L219 684ZM393 983Q393 848 272 848Q212 848 182 883T152 983Q152 1046 183 1082T272 1118Q323 1118 358 1086T393 983Z" /> -<glyph unicode="¢" glyph-name="cent" horiz-adv-x="1171" d="M971 240Q866 186 719 180V-20H586V186Q383 218 287 354T190 741Q190 1249 586 1311V1483H721V1319Q796 1316 867 1300T987 1260L938 1120Q805 1171 696 1171Q524 1171 443 1066T362 743Q362 -531 441 430T688 328Q829 328 971 387V240Z" /> -<glyph unicode="£" glyph-name="sterling" horiz-adv-x="1171" d="M682 1481Q872 1481 1042 1397L981 1264Q827 1341 684 1341Q561 1341 499 1279T436 1077V782H858V655H436V434Q436 334 404 266T297 154H1092V0H63V141Q268 188 268 432V655H70V782H268V1098Q268 -1276 380 1378T682 1481Z" /> -<glyph unicode="¤" glyph-name="currency" horiz-adv-x="1171" d="M184 723Q184 845 258 952L123 1092L217 1184L352 1051Q456 1124 586 1124Q713 1124 815 1051L952 1184L1047 1092L913 954Q987 841 987 723Q987 592 913 489L1044 354L952 262L815 395Q713 -324 586 324Q452 324 352 397L217 264L125 356L258 492Q184 599 184 723ZM313 723Q313 611 391 531T586 451Q702 451 781 530T860 723Q860 837 780 918T586 999Q470 999 392 917T313 723Z" /> -<glyph unicode="¥" glyph-name="yen" horiz-adv-x="1171" d="M584 735L963 1462H1137L721 692H983V565H666V395H983V268H666V0H502V268H186V395H502V565H186V692H442L31 1462H209L584 735Z" /> -<glyph unicode="¦" glyph-name="brokenbar" horiz-adv-x="1128" d="M494 1556H635V780H494V1556ZM494 281H635V-496H494V281Z" /> -<glyph unicode="§" glyph-name="section" horiz-adv-x="1057" d="M139 809Q139 895 182 963T303 1069Q229 1109 187 1164T145 1305Q145 1426 248 1495T549 1565Q643 1565 722 1551T899 1497L846 1366Q748 1405 681 1418T537 1432Q421 1432 363 1403T305 1309Q305 -1249 366 1207T582 1110Q768 1042 843 967T918 784Q918 694 877 624T762 512Q915 431 915 285Q915 145 798 69T469 -8Q251 -8 123 57V205Q201 168 298 146T477 123Q611 123 681 161T752 270Q752 316 728 345T650 403T481 475Q339 527 272 572T172 674T139 809ZM285 -829Q285 752 351 700T584 586L633 567Q770 647 770 758Q770 841 697 897T438 1010Q370 991 328 941T285 829Z" /> -<glyph unicode="¨" glyph-name="dieresis" horiz-adv-x="1182" d="M309 1393Q309 1445 335 1468T399 1491Q437 1491 464 1468T492 1393Q492 1343 465 1319T399 1294Q362 1294 336 1318T309 1393ZM690 1393Q690 1445 716 1468T780 1491Q817 1491 844 1468T872 -1393Q872 1343 845 1319T780 1294Q743 1294 717 1318T690 1393Z" /> -<glyph unicode="©" glyph-name="copyright" horiz-adv-x="1704" d="M893 1059Q768 1059 701 972T633 731Q633 563 696 482T891 401Q977 401 1102 446V322Q1054 302 1004 288T883 274Q689 274 585 394T481 731Q481 940 591 1063T893 1186Q1021 1186 1139 1126L1081 -1008Q973 1059 893 1059ZM100 731Q100 931 200 1106T475 1382T852 1483Q1052 1483 1227 1383T1503 1108T1604 731Q1604 534 1507 361T1235 84T852 -20Q645 -20 470 83T198 360T100 731ZM205 731Q205 558 292 408T529 171T852 84Q1026 84 1175 171T1411 406T1499 -731Q1499 905 1412 1054T1177 1290T852 1378Q678 1378 529 1291T293 1056T205 731Z" /> -<glyph unicode="ª" glyph-name="ordfeminine" horiz-adv-x="725" d="M532 801L508 885Q416 788 276 788Q181 788 126 837T70 989Q70 1091 147 1143T389 1202L506 1206V1245Q506 1378 358 1378Q258 1378 154 1327L111 1423Q225 1479 358 1479Q488 1479 556 -1427T625 1253V801H532ZM193 989Q193 889 305 889Q506 889 506 1069V1118L408 1114Q296 1110 245 1082T193 989Z" /> -<glyph unicode="«" glyph-name="guillemotleft" horiz-adv-x="1018" d="M82 551L424 958L543 889L254 539L543 188L424 117L82 524V551ZM477 551L821 958L938 889L651 539L938 188L821 117L477 524V551Z" /> -<glyph unicode="¬" glyph-name="logicalnot" horiz-adv-x="1171" d="M1065 791V264H928V653H104V791H1065Z" /> -<glyph unicode="­" glyph-name="uni00AD" horiz-adv-x="659" d="M84 473V625H575V473H84Z" /> -<glyph unicode="®" glyph-name="registered" horiz-adv-x="1704" d="M723 762H831Q911 762 959 803T1008 909Q1008 984 965 1016T829 1049H723V762ZM1157 913Q1157 833 1115 772T995 680L1233 285H1065L858 639H723V285H575V1176H836Q1002 1176 1079 1111T1157 -913ZM100 731Q100 931 200 1106T475 1382T852 1483Q1052 1483 1227 1383T1503 1108T1604 731Q1604 534 1507 361T1235 84T852 -20Q645 -20 470 83T198 360T100 731ZM205 731Q205 558 292 408T529 171T852 84Q1026 84 1175 171T1411 406T1499 731Q1499 905 1412 -1054T1177 1290T852 1378Q678 1378 529 1291T293 1056T205 731Z" /> -<glyph unicode="¯" glyph-name="overscore" horiz-adv-x="1024" d="M1030 1556H-6V1683H1030V1556Z" /> -<glyph unicode="°" glyph-name="degree" horiz-adv-x="877" d="M127 1171Q127 1301 217 1392T438 1483Q568 1483 659 1393T750 1171Q750 1087 709 1016T595 902T438 860Q308 860 218 950T127 1171ZM242 1171Q242 1089 300 1032T440 975Q520 975 577 1031T635 -1171Q635 1255 579 1311T440 1368Q357 1368 300 1311T242 1171Z" /> -<glyph unicode="±" glyph-name="plusminus" horiz-adv-x="1171" d="M653 791H1065V653H653V227H514V653H104V791H514V1219H653V791ZM104 1V139H1065V1H104Z" /> -<glyph unicode="²" glyph-name="twosuperior" horiz-adv-x="711" d="M653 586H49V690L285 920Q374 1006 415 1054T472 1141T489 1233Q489 1301 449 1335T346 1370Q294 1370 245 1351T127 1282L61 1370Q192 1481 344 1481Q476 1481 549 1416T623 1239Q623 -1159 579 1084T387 870L213 705H653V586Z" /> -<glyph unicode="³" glyph-name="threesuperior" horiz-adv-x="711" d="M627 1255Q627 1175 586 1124T477 1049Q653 1002 653 840Q653 712 561 641T301 569Q149 569 33 625V748Q180 680 303 680Q514 680 514 842Q514 987 283 987H166V1094H285Q388 1094 437 -1133T487 1241Q487 1302 447 1336T340 1370Q274 1370 218 1349T106 1292L37 1382Q100 1427 170 1454T334 1481Q470 1481 548 1422T627 1255Z" /> -<glyph unicode="´" glyph-name="acute" horiz-adv-x="1182" d="M393 1266Q441 1328 496 1416T584 1569H786V1548Q742 1483 655 1388T504 1241H393V1266Z" /> -<glyph unicode="µ" glyph-name="mu" horiz-adv-x="1268" d="M342 381Q342 119 596 119Q767 119 846 213T926 520V1096H1092V0H956L930 147H920Q809 -20 580 -20Q430 -20 342 72H332Q342 -12 342 -172V-492H176V1096H342V381Z" /> -<glyph unicode="¶" glyph-name="paragraph" horiz-adv-x="1341" d="M1120 -260H1006V1452H793V-260H678V559Q616 541 532 541Q316 541 215 666T113 1042Q113 1302 222 1429T563 1556H1120V-260Z" /> -<glyph unicode="·" glyph-name="middot" horiz-adv-x="545" d="M152 723Q152 789 183 823T270 858Q328 858 360 824T393 723Q393 658 360 623T270 588Q219 588 186 619T152 723Z" /> -<glyph unicode="¸" glyph-name="cedilla" horiz-adv-x="465" d="M436 -289Q436 -386 360 -439T133 -492Q82 -492 37 -483V-377Q82 -385 141 -385Q220 -385 260 -365T301 -291Q301 -248 262 -222T113 -178L201 0H311L256 -115Q436 -154 436 -289Z" /> -<glyph unicode="¹" glyph-name="onesuperior" horiz-adv-x="711" d="M338 1462H481V586H348V1165Q348 1256 354 1346Q332 1324 305 1302T143 1184L76 1280L338 1462Z" /> -<glyph unicode="º" glyph-name="ordmasculine" horiz-adv-x="768" d="M702 1135Q702 971 617 880T381 788Q235 788 151 881T66 1135Q66 1298 150 1388T385 1479Q537 1479 619 1388T702 1135ZM188 1135Q188 1013 233 952T383 891Q488 891 534 952T580 1135Q580 -1258 534 1317T383 1376Q280 1376 234 1317T188 1135Z" /> -<glyph unicode="»" glyph-name="guillemotright" horiz-adv-x="1018" d="M936 524L592 117L475 188L762 539L475 889L592 958L936 551V524ZM541 524L197 117L80 188L367 539L80 889L197 958L541 551V524Z" /> -<glyph unicode="¼" glyph-name="onequarter" horiz-adv-x="1597" d="M1298 1462L395 0H252L1155 1462H1298ZM593 1462H736V586H603V1165Q603 1256 609 1346Q587 1324 560 1302T398 1184L331 1280L593 1462ZM1489 203H1364V1H1219V203H817V304L1225 883H1364V320H1489V203ZM1219 -320V515Q1219 649 1225 724Q1220 712 1208 693T1181 651T1151 606T1125 566L957 320H1219Z" /> -<glyph unicode="½" glyph-name="onehalf" horiz-adv-x="1597" d="M1230 1462L327 0H184L1087 1462H1230ZM564 1462H707V586H574V1165Q574 1256 580 1346Q558 1324 531 1302T369 1184L302 1280L564 1462ZM1499 1H895V105L1131 335Q1220 421 1261 469T1318 -556T1335 648Q1335 716 1295 750T1192 785Q1140 785 1091 766T973 697L907 785Q1038 896 1190 896Q1322 896 1395 831T1469 654Q1469 574 1425 499T1233 285L1059 120H1499V1Z" /> -<glyph unicode="¾" glyph-name="threequarters" horiz-adv-x="1597" d="M876 1255Q876 1175 835 1124T726 1049Q902 1002 902 840Q902 712 810 641T550 569Q398 569 282 625V748Q429 680 552 680Q763 680 763 842Q763 987 532 987H415V1094H534Q637 1094 -686 1133T736 1241Q736 1302 696 1336T589 1370Q523 1370 467 1349T355 1292L286 1382Q349 1427 419 1454T583 1481Q719 1481 797 1422T876 1255ZM1390 1462L487 0H344L1247 1462H1390ZM1569 203H1444V1H1299V203H897V304L1305 883H1444V320H1569V203ZM1299 320V515Q1299 -649 1305 724Q1300 712 1288 693T1261 651T1231 606T1205 566L1037 320H1299Z" /> -<glyph unicode="¿" glyph-name="questiondown" horiz-adv-x="879" d="M590 684V633Q590 511 553 437T418 279Q297 173 267 136T224 60T211 -35Q211 -135 277 -191T465 -248Q545 -248 620 -229T793 -162L852 -297Q655 -393 457 -393Q267 -393 159 -300T51 --37Q51 33 68 85T118 182T194 268T293 356Q394 444 426 502T459 653V684H590ZM639 983Q639 848 518 848Q459 848 428 882T397 983Q397 1047 430 1082T518 1118Q569 1118 604 1086T639 983Z" /> -<glyph unicode="À" glyph-name="Agrave" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM724 1579H614Q549 1631 460 1727T331 1886V1907H534Q566 1838 -623 1748T724 1604V1579Z" /> -<glyph unicode="Á" glyph-name="Aacute" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM526 1604Q574 1666 629 1754T717 1907H919V1886Q875 1821 788 -1726T637 1579H526V1604Z" /> -<glyph unicode="Â" glyph-name="Acircumflex" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM303 1602Q430 1738 481 1802T555 1907H721Q743 1865 797 -1799T977 1602V1579H858Q770 1634 637 1765Q501 1631 418 1579H303V1602Z" /> -<glyph unicode="Ã" glyph-name="Atilde" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM792 1581Q749 1581 708 1599T628 1640T552 1681T481 1700Q431 -1700 406 1670T366 1579H268Q281 1700 338 1768T487 1837Q533 1837 576 1819T658 1778T733 1737T801 1718Q850 1718 874 1747T913 1839H1012Q999 1718 943 1650T792 1581Z" /> -<glyph unicode="Ä" glyph-name="Adieresis" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM364 1731Q364 1783 390 1806T454 1829Q492 1829 519 1806T547 -1731Q547 1681 520 1657T454 1632Q417 1632 391 1656T364 1731ZM745 1731Q745 1783 771 1806T835 1829Q872 1829 899 1806T927 1731Q927 1681 900 1657T835 1632Q798 1632 772 1656T745 1731Z" /> -<glyph unicode="Å" glyph-name="Aring" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM870 1587Q870 1489 809 1430T645 1370Q544 1370 484 1428T424 -1585Q424 1683 484 1740T645 1798Q746 1798 808 1739T870 1587ZM762 1585Q762 1641 729 1671T645 1702Q594 1702 561 1672T528 1585Q528 1529 558 1499T645 1468Q697 1468 729 1498T762 1585Z" /> -<glyph unicode="Æ" glyph-name="AE" horiz-adv-x="1788" d="M1665 0H915V465H401L174 0H-2L696 1462H1665V1311H1085V840H1626V690H1085V152H1665V0ZM469 618H915V1311H797L469 618Z" /> -<glyph unicode="Ç" glyph-name="Ccedilla" horiz-adv-x="1292" d="M827 1331Q586 1331 447 1171T307 731Q307 444 441 288T825 131Q978 131 1174 186V37Q1022 -20 799 -20Q476 -20 301 176T125 733Q125 959 209 1129T453 1391T829 1483Q1059 1483 1231 1399L1159 -1253Q993 1331 827 1331ZM950 -289Q950 -386 874 -439T647 -492Q596 -492 551 -483V-377Q596 -385 655 -385Q734 -385 774 -365T815 -291Q815 -248 776 -222T627 -178L715 0H825L770 -115Q950 -154 950 -289Z" /> -<glyph unicode="È" glyph-name="Egrave" horiz-adv-x="1139" d="M1016 0H201V1462H1016V1311H371V840H977V690H371V152H1016V0ZM713 1579H603Q538 1631 449 1727T320 1886V1907H523Q555 1838 612 1748T713 1604V1579Z" /> -<glyph unicode="É" glyph-name="Eacute" horiz-adv-x="1139" d="M1016 0H201V1462H1016V1311H371V840H977V690H371V152H1016V0ZM456 1604Q504 1666 559 1754T647 1907H849V1886Q805 1821 718 1726T567 1579H456V1604Z" /> -<glyph unicode="Ê" glyph-name="Ecircumflex" horiz-adv-x="1139" d="M1016 0H201V1462H1016V1311H371V840H977V690H371V152H1016V0ZM263 1602Q390 1738 441 1802T515 1907H681Q703 1865 757 1799T937 1602V1579H818Q730 1634 597 1765Q461 1631 378 1579H263V1602Z" /> -<glyph unicode="Ë" glyph-name="Edieresis" horiz-adv-x="1139" d="M1016 0H201V1462H1016V1311H371V840H977V690H371V152H1016V0ZM327 1731Q327 1783 353 1806T417 1829Q455 1829 482 1806T510 1731Q510 1681 483 1657T417 1632Q380 1632 354 1656T327 1731ZM708 -1731Q708 1783 734 1806T798 1829Q835 1829 862 1806T890 1731Q890 1681 863 1657T798 1632Q761 1632 735 1656T708 1731Z" /> -<glyph unicode="Ì" glyph-name="Igrave" horiz-adv-x="571" d="M201 0V1462H371V0H201ZM398 1579H288Q223 1631 134 1727T5 1886V1907H208Q240 1838 297 1748T398 1604V1579Z" /> -<glyph unicode="Í" glyph-name="Iacute" horiz-adv-x="571" d="M201 0V1462H371V0H201ZM179 1604Q227 1666 282 1754T370 1907H572V1886Q528 1821 441 1726T290 1579H179V1604Z" /> -<glyph unicode="Î" glyph-name="Icircumflex" horiz-adv-x="571" d="M201 0V1462H371V0H201ZM-57 1602Q70 1738 121 1802T195 1907H361Q383 1865 437 1799T617 1602V1579H498Q410 1634 277 1765Q141 1631 58 1579H-57V1602Z" /> -<glyph unicode="Ï" glyph-name="Idieresis" horiz-adv-x="571" d="M201 0V1462H371V0H201ZM5 1731Q5 1783 31 1806T95 1829Q133 1829 160 1806T188 1731Q188 1681 161 1657T95 1632Q58 1632 32 1656T5 1731ZM386 1731Q386 1783 412 1806T476 1829Q513 1829 -540 1806T568 1731Q568 1681 541 1657T476 1632Q439 1632 413 1656T386 1731Z" /> -<glyph unicode="Ð" glyph-name="Eth" horiz-adv-x="1479" d="M1352 745Q1352 383 1156 192T590 0H201V649H47V799H201V1462H635Q972 1462 1162 1275T1352 745ZM1171 739Q1171 1315 602 1315H371V799H750V649H371V147H561Q1171 147 1171 739Z" /> -<glyph unicode="Ñ" glyph-name="Ntilde" horiz-adv-x="1544" d="M1343 0H1149L350 1227H342Q358 1011 358 831V0H201V1462H393L1190 240H1198Q1196 267 1189 413T1184 623V1462H1343V0ZM935 1581Q892 1581 851 1599T771 1640T695 1681T624 1700Q574 1700 -549 1670T509 1579H411Q424 1700 481 1768T630 1837Q676 1837 719 1819T801 1778T876 1737T944 1718Q993 1718 1017 1747T1056 1839H1155Q1142 1718 1086 1650T935 1581Z" /> -<glyph unicode="Ò" glyph-name="Ograve" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290 733Q1290 -1028 1167 1180T801 1333Q558 1333 432 1180T305 733ZM907 1579H797Q732 1631 643 1727T514 1886V1907H717Q749 1838 806 1748T907 1604V1579Z" /> -<glyph unicode="Ó" glyph-name="Oacute" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290 733Q1290 -1028 1167 1180T801 1333Q558 1333 432 1180T305 733ZM659 1604Q707 1666 762 1754T850 1907H1052V1886Q1008 1821 921 1726T770 1579H659V1604Z" /> -<glyph unicode="Ô" glyph-name="Ocircumflex" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290 -733Q1290 1028 1167 1180T801 1333Q558 1333 432 1180T305 733ZM448 1602Q575 1738 626 1802T700 1907H866Q888 1865 942 1799T1122 1602V1579H1003Q915 1634 782 1765Q646 1631 563 1579H448V1602Z" /> -<glyph unicode="Õ" glyph-name="Otilde" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290 733Q1290 -1028 1167 1180T801 1333Q558 1333 432 1180T305 733ZM942 1581Q899 1581 858 1599T778 1640T702 1681T631 1700Q581 1700 556 1670T516 1579H418Q431 1700 488 1768T637 1837Q683 1837 726 1819T808 1778T883 1737T951 1718Q1000 1718 1024 1747T1063 1839H1162Q1149 -1718 1093 1650T942 1581Z" /> -<glyph unicode="Ö" glyph-name="Odieresis" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290 -733Q1290 1028 1167 1180T801 1333Q558 1333 432 1180T305 733ZM522 1731Q522 1783 548 1806T612 1829Q650 1829 677 1806T705 1731Q705 1681 678 1657T612 1632Q575 1632 549 1656T522 1731ZM903 1731Q903 1783 929 1806T993 1829Q1030 1829 1057 1806T1085 1731Q1085 -1681 1058 1657T993 1632Q956 1632 930 1656T903 1731Z" /> -<glyph unicode="×" glyph-name="multiply" horiz-adv-x="1171" d="M940 1176L1036 1077L684 723L1034 371L938 272L584 623L236 272L135 371L485 723L133 1075L233 1176L586 821L940 1176Z" /> -<glyph unicode="Ø" glyph-name="Oslash" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q564 -20 416 80L315 -61L195 18L303 172Q125 370 125 735Q125 1092 301 1288T801 1485Q1010 1485 1167 1391L1264 1526L1384 1446L1278 1298Q1470 1096 -1470 733ZM1290 733Q1290 1005 1180 1159L508 211Q623 129 799 129Q1042 129 1166 282T1290 733ZM305 733Q305 471 406 317L1075 1260Q969 1333 801 1333Q558 1333 432 1180T305 733Z" /> -<glyph unicode="Ù" glyph-name="Ugrave" horiz-adv-x="1491" d="M1305 1462V516Q1305 266 1154 123T739 -20Q475 -20 331 124T186 520V1462H356V508Q356 325 456 227T750 129Q935 129 1035 227T1135 510V1462H1305ZM856 1579H746Q681 1631 592 1727T463 1886V1907H666Q698 -1838 755 1748T856 1604V1579Z" /> -<glyph unicode="Ú" glyph-name="Uacute" horiz-adv-x="1491" d="M1305 1462V516Q1305 266 1154 123T739 -20Q475 -20 331 124T186 520V1462H356V508Q356 325 456 227T750 129Q935 129 1035 227T1135 510V1462H1305ZM600 1604Q648 1666 703 1754T791 1907H993V1886Q949 -1821 862 1726T711 1579H600V1604Z" /> -<glyph unicode="Û" glyph-name="Ucircumflex" horiz-adv-x="1491" d="M1305 1462V516Q1305 266 1154 123T739 -20Q475 -20 331 124T186 520V1462H356V508Q356 325 456 227T750 129Q935 129 1035 227T1135 510V1462H1305ZM393 1602Q520 1738 571 1802T645 -1907H811Q833 1865 887 1799T1067 1602V1579H948Q860 1634 727 1765Q591 1631 508 1579H393V1602Z" /> -<glyph unicode="Ü" glyph-name="Udieresis" horiz-adv-x="1491" d="M1305 1462V516Q1305 266 1154 123T739 -20Q475 -20 331 124T186 520V1462H356V508Q356 325 456 227T750 129Q935 129 1035 227T1135 510V1462H1305ZM461 1731Q461 1783 487 1806T551 1829Q589 -1829 616 1806T644 1731Q644 1681 617 1657T551 1632Q514 1632 488 1656T461 1731ZM842 1731Q842 1783 868 1806T932 1829Q969 1829 996 1806T1024 1731Q1024 1681 997 1657T932 1632Q895 1632 869 1656T842 1731Z" /> -<glyph unicode="Ý" glyph-name="Yacute" horiz-adv-x="1147" d="M573 731L963 1462H1147L659 567V0H487V559L0 1462H186L573 731ZM442 1604Q490 1666 545 1754T633 1907H835V1886Q791 1821 704 1726T553 1579H442V1604Z" /> -<glyph unicode="Þ" glyph-name="Thorn" horiz-adv-x="1251" d="M1145 784Q1145 557 994 438T555 319H371V0H201V1462H371V1206H586Q867 1206 1006 1103T1145 784ZM371 465H539Q765 465 866 536T967 772Q967 921 872 990T575 1059H371V465Z" /> -<glyph unicode="ß" glyph-name="germandbls" horiz-adv-x="1274" d="M1049 1266Q1049 1131 906 1016Q818 946 790 913T762 846Q762 814 775 793T824 744T938 664Q1078 569 1129 491T1180 311Q1180 151 1083 66T807 -20Q619 -20 512 49V203Q575 164 653 141T803 -117Q1018 117 1018 299Q1018 374 977 427T825 551Q698 633 650 694T602 840Q602 903 636 956T742 1062Q817 1119 849 1164T881 1262Q881 1342 813 1384T618 1427Q342 1427 342 1204V0H176V1202Q176 1380 286 1473T618 1567Q824 1567 936 1489T1049 1266Z" /> -<glyph unicode="à" glyph-name="agrave" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114 -878 1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM928 1241H818Q753 1293 664 1389T535 1548V1569H738Q770 1500 827 1410T928 1266V1241Z" /> -<glyph unicode="á" glyph-name="aacute" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114 -878 1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM436 1266Q484 1328 539 1416T627 1569H829V1548Q785 1483 698 1388T547 1241H436V1266Z" /> -<glyph unicode="â" glyph-name="acircumflex" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 -1114 878 1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM484 1264Q611 1400 662 1464T736 1569H902Q924 1527 978 1461T1158 1264V1241H1039Q951 1296 818 1427Q682 1293 599 1241H484V1264Z" -/> -<glyph unicode="ã" glyph-name="atilde" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114 -878 1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM977 1243Q934 1243 893 1261T813 1302T737 1343T666 1362Q616 1362 591 1332T551 1241H453Q466 1362 523 1430T672 1499Q718 1499 761 -1481T843 1440T918 1399T986 1380Q1035 1380 1059 1409T1098 1501H1197Q1184 1380 1128 1312T977 1243Z" /> -<glyph unicode="ä" glyph-name="adieresis" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114 -878 1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM535 1393Q535 1445 561 1468T625 1491Q663 1491 690 1468T718 1393Q718 1343 691 1319T625 1294Q588 1294 562 1318T535 1393ZM916 1393Q916 -1445 942 1468T1006 1491Q1043 1491 1070 1468T1098 1393Q1098 1343 1071 1319T1006 1294Q969 1294 943 1318T916 1393Z" /> -<glyph unicode="å" glyph-name="aring" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114 878 -1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM1060 1458Q1060 1360 999 1301T835 1241Q734 1241 674 1299T614 1456Q614 1554 674 1611T835 1669Q936 1669 998 1610T1060 1458ZM952 1456Q952 -1512 919 1542T835 1573Q784 1573 751 1543T718 1456Q718 1400 748 1370T835 1339Q887 1339 919 1369T952 1456Z" /> -<glyph unicode="æ" glyph-name="ae" horiz-adv-x="1757" d="M94 303Q94 464 218 553T596 651L780 657V725Q780 854 722 915T545 977Q401 977 238 893L186 1020Q260 1061 359 1087T557 1114Q687 1114 769 1071T893 932Q946 1020 1031 1068T1227 1116Q1419 -1116 1535 983T1651 627V520H950Q958 125 1272 125Q1363 125 1441 142T1604 199V51Q1518 13 1444 -3T1268 -20Q979 -20 854 213Q773 86 675 33T442 -20Q279 -20 187 65T94 303ZM268 301Q268 206 321 162T463 117Q608 117 692 201T776 440V539L618 532Q432 524 350 -470T268 301ZM1225 977Q1104 977 1035 894T954 653H1473Q1473 809 1409 893T1225 977Z" /> -<glyph unicode="ç" glyph-name="ccedilla" horiz-adv-x="975" d="M614 -20Q376 -20 246 126T115 541Q115 816 247 966T625 1116Q704 1116 783 1099T907 1059L856 918Q801 940 736 954T621 969Q287 969 287 543Q287 341 368 233T610 125Q747 125 891 184V37Q781 --20 614 -20ZM762 -289Q762 -386 686 -439T459 -492Q408 -492 363 -483V-377Q408 -385 467 -385Q546 -385 586 -365T627 -291Q627 -248 588 -222T439 -178L527 0H637L582 -115Q762 -154 762 -289Z" /> -<glyph unicode="è" glyph-name="egrave" horiz-adv-x="1149" d="M639 -20Q396 -20 256 128T115 539Q115 804 245 960T596 1116Q802 1116 922 981T1042 623V518H287Q292 325 384 225T645 125Q822 125 995 199V51Q907 13 829 -3T639 -20ZM594 977Q462 977 384 -891T291 653H864Q864 810 794 893T594 977ZM967 1241H857Q792 1293 703 1389T574 1548V1569H777Q809 1500 866 1410T967 1266V1241Z" /> -<glyph unicode="é" glyph-name="eacute" horiz-adv-x="1149" d="M639 -20Q396 -20 256 128T115 539Q115 804 245 960T596 1116Q802 1116 922 981T1042 623V518H287Q292 325 384 225T645 125Q822 125 995 199V51Q907 13 829 -3T639 -20ZM594 977Q462 977 384 -891T291 653H864Q864 810 794 893T594 977ZM471 1266Q519 1328 574 1416T662 1569H864V1548Q820 1483 733 1388T582 1241H471V1266Z" /> -<glyph unicode="ê" glyph-name="ecircumflex" horiz-adv-x="1149" d="M639 -20Q396 -20 256 128T115 539Q115 804 245 960T596 1116Q802 1116 922 981T1042 623V518H287Q292 325 384 225T645 125Q822 125 995 199V51Q907 13 829 -3T639 -20ZM594 977Q462 -977 384 891T291 653H864Q864 810 794 893T594 977ZM515 1264Q642 1400 693 1464T767 1569H933Q955 1527 1009 1461T1189 1264V1241H1070Q982 1296 849 1427Q713 1293 630 1241H515V1264Z" /> -<glyph unicode="ë" glyph-name="edieresis" horiz-adv-x="1149" d="M639 -20Q396 -20 256 128T115 539Q115 804 245 960T596 1116Q802 1116 922 981T1042 623V518H287Q292 325 384 225T645 125Q822 125 995 199V51Q907 13 829 -3T639 -20ZM594 977Q462 977 -384 891T291 653H864Q864 810 794 893T594 977ZM319 1393Q319 1445 345 1468T409 1491Q447 1491 474 1468T502 1393Q502 1343 475 1319T409 1294Q372 1294 346 1318T319 1393ZM700 1393Q700 1445 726 1468T790 1491Q827 1491 854 1468T882 1393Q882 1343 855 1319T790 -1294Q753 1294 727 1318T700 1393Z" /> -<glyph unicode="ì" glyph-name="igrave" horiz-adv-x="518" d="M342 0H176V1096H342V0ZM355 1241H245Q180 1293 91 1389T-38 1548V1569H165Q197 1500 254 1410T355 1266V1241Z" /> -<glyph unicode="í" glyph-name="iacute" horiz-adv-x="518" d="M342 0H176V1096H342V0ZM169 1266Q217 1328 272 1416T360 1569H562V1548Q518 1483 431 1388T280 1241H169V1266Z" /> -<glyph unicode="î" glyph-name="icircumflex" horiz-adv-x="518" d="M342 0H176V1096H342V0ZM-77 1264Q50 1400 101 1464T175 1569H341Q363 1527 417 1461T597 1264V1241H478Q390 1296 257 1427Q121 1293 38 1241H-77V1264Z" /> -<glyph unicode="ï" glyph-name="idieresis" horiz-adv-x="518" d="M342 0H176V1096H342V0ZM-20 1393Q-20 1445 6 1468T70 1491Q108 1491 135 1468T163 1393Q163 1343 136 1319T70 1294Q33 1294 7 1318T-20 1393ZM361 1393Q361 1445 387 1468T451 1491Q488 -1491 515 1468T543 1393Q543 1343 516 1319T451 1294Q414 1294 388 1318T361 1393Z" /> -<glyph unicode="ð" glyph-name="eth" horiz-adv-x="1221" d="M1122 563Q1122 282 992 131T614 -20Q392 -20 253 114T113 475Q113 705 244 836T596 967Q822 967 922 846L930 850Q873 1064 668 1255L397 1100L324 1208L557 1341Q465 1403 371 1452L440 1569Q596 -1496 698 1421L936 1559L1012 1452L805 1333Q957 1190 1039 991T1122 563ZM954 512Q954 659 864 744T618 829Q281 829 281 469Q281 302 368 211T618 119Q793 119 873 219T954 512Z" /> -<glyph unicode="ñ" glyph-name="ntilde" horiz-adv-x="1257" d="M926 0V709Q926 843 865 909T674 975Q502 975 422 882T342 575V0H176V1096H311L338 946H346Q397 1027 489 1071T694 1116Q892 1116 992 1021T1092 715V0H926ZM802 1243Q759 1243 718 1261T638 -1302T562 1343T491 1362Q441 1362 416 1332T376 1241H278Q291 1362 348 1430T497 1499Q543 1499 586 1481T668 1440T743 1399T811 1380Q860 1380 884 1409T923 1501H1022Q1009 1380 953 1312T802 1243Z" /> -<glyph unicode="ò" glyph-name="ograve" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950 549Q950 -758 866 866T616 975Q453 975 370 868T287 549ZM998 1241H888Q823 1293 734 1389T605 1548V1569H808Q840 1500 897 1410T998 1266V1241Z" /> -<glyph unicode="ó" glyph-name="oacute" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950 549Q950 -758 866 866T616 975Q453 975 370 868T287 549ZM479 1266Q527 1328 582 1416T670 1569H872V1548Q828 1483 741 1388T590 1241H479V1266Z" /> -<glyph unicode="ô" glyph-name="ocircumflex" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950 -549Q950 758 866 866T616 975Q453 975 370 868T287 549ZM282 1264Q409 1400 460 1464T534 1569H700Q722 1527 776 1461T956 1264V1241H837Q749 1296 616 1427Q480 1293 397 1241H282V1264Z" /> -<glyph unicode="õ" glyph-name="otilde" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950 549Q950 -758 866 866T616 975Q453 975 370 868T287 549ZM1029 1243Q986 1243 945 1261T865 1302T789 1343T718 1362Q668 1362 643 1332T603 1241H505Q518 1362 575 1430T724 1499Q770 1499 813 1481T895 1440T970 1399T1038 1380Q1087 1380 1111 1409T1150 1501H1249Q1236 -1380 1180 1312T1029 1243Z" /> -<glyph unicode="ö" glyph-name="odieresis" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950 549Q950 -758 866 866T616 975Q453 975 370 868T287 549ZM336 1393Q336 1445 362 1468T426 1491Q464 1491 491 1468T519 1393Q519 1343 492 1319T426 1294Q389 1294 363 1318T336 1393ZM717 1393Q717 1445 743 1468T807 1491Q844 1491 871 1468T899 1393Q899 1343 872 1319T807 -1294Q770 1294 744 1318T717 1393Z" /> -<glyph unicode="÷" glyph-name="divide" horiz-adv-x="1171" d="M104 653V791H1065V653H104ZM471 373Q471 433 500 463T584 494Q636 494 665 463T694 373Q694 316 665 284T584 252Q532 252 502 283T471 373ZM471 1071Q471 1131 500 1161T584 1192Q636 1192 -665 1161T694 1071Q694 1014 665 982T584 950Q532 950 502 981T471 1071Z" /> -<glyph unicode="ø" glyph-name="oslash" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q460 -20 348 49L264 -68L150 10L244 141Q115 293 115 549Q115 817 249 966T621 1116Q775 1116 891 1040L975 1159L1092 1083L995 950Q1122 798 1122 549ZM287 -549Q287 378 340 276L805 922Q730 975 616 975Q453 975 370 868T287 549ZM950 549Q950 713 899 813L434 170Q505 119 618 119Q781 119 865 228T950 549Z" /> -<glyph unicode="ù" glyph-name="ugrave" horiz-adv-x="1257" d="M332 1096V385Q332 251 393 185T584 119Q756 119 835 213T915 520V1096H1081V0H944L920 147H911Q860 66 770 23T563 -20Q363 -20 264 75T164 379V1096H332ZM982 1241H872Q807 1293 718 1389T589 -1548V1569H792Q824 1500 881 1410T982 1266V1241Z" /> -<glyph unicode="ú" glyph-name="uacute" horiz-adv-x="1257" d="M332 1096V385Q332 251 393 185T584 119Q756 119 835 213T915 520V1096H1081V0H944L920 147H911Q860 66 770 23T563 -20Q363 -20 264 75T164 379V1096H332ZM506 1266Q554 1328 609 1416T697 -1569H899V1548Q855 1483 768 1388T617 1241H506V1266Z" /> -<glyph unicode="û" glyph-name="ucircumflex" horiz-adv-x="1257" d="M332 1096V385Q332 251 393 185T584 119Q756 119 835 213T915 520V1096H1081V0H944L920 147H911Q860 66 770 23T563 -20Q363 -20 264 75T164 379V1096H332ZM286 1264Q413 1400 464 1464T538 -1569H704Q726 1527 780 1461T960 1264V1241H841Q753 1296 620 1427Q484 1293 401 1241H286V1264Z" /> -<glyph unicode="ü" glyph-name="udieresis" horiz-adv-x="1257" d="M332 1096V385Q332 251 393 185T584 119Q756 119 835 213T915 520V1096H1081V0H944L920 147H911Q860 66 770 23T563 -20Q363 -20 264 75T164 379V1096H332ZM342 1393Q342 1445 368 1468T432 -1491Q470 1491 497 1468T525 1393Q525 1343 498 1319T432 1294Q395 1294 369 1318T342 1393ZM723 1393Q723 1445 749 1468T813 1491Q850 1491 877 1468T905 1393Q905 1343 878 1319T813 1294Q776 1294 750 1318T723 1393Z" /> -<glyph unicode="ý" glyph-name="yacute" horiz-adv-x="1032" d="M2 1096H180L420 471Q499 257 518 162H526Q539 213 580 336T852 1096H1030L559 -152Q489 -337 396 -414T166 -492Q90 -492 16 -475V-342Q71 -354 139 -354Q310 -354 383 -162L444 -6L2 1096ZM411 -1266Q459 1328 514 1416T602 1569H804V1548Q760 1483 673 1388T522 1241H411V1266Z" /> -<glyph unicode="þ" glyph-name="thorn" horiz-adv-x="1255" d="M344 948Q410 1037 495 1076T686 1116Q901 1116 1021 966T1141 549Q1141 281 1021 131T686 -20Q464 -20 342 141H330L334 107Q342 30 342 -33V-492H176V1556H342V1090Q342 1038 336 948H344ZM664 -975Q496 975 420 883T342 590V549Q342 318 419 219T666 119Q969 119 969 551Q969 766 895 870T664 975Z" /> -<glyph unicode="ÿ" glyph-name="ydieresis" horiz-adv-x="1032" d="M2 1096H180L420 471Q499 257 518 162H526Q539 213 580 336T852 1096H1030L559 -152Q489 -337 396 -414T166 -492Q90 -492 16 -475V-342Q71 -354 139 -354Q310 -354 383 -162L444 -6L2 1096ZM490 -1393Q490 1445 516 1468T580 1491Q618 1491 645 1468T673 1393Q673 1343 646 1319T580 1294Q543 1294 517 1318T490 1393ZM871 1393Q871 1445 897 1468T961 1491Q998 1491 1025 1468T1053 1393Q1053 1343 1026 1319T961 1294Q924 1294 898 1318T871 1393Z" /> -<glyph unicode="–" glyph-name="endash" horiz-adv-x="1024" d="M82 473V625H942V473H82Z" /> -<glyph unicode="—" glyph-name="emdash" horiz-adv-x="2048" d="M82 473V625H1966V473H82Z" /> -<glyph unicode="‘" glyph-name="quoteleft" horiz-adv-x="348" d="M37 961L25 983Q47 1073 96 1207T201 1462H324Q258 1208 221 961H37Z" /> -<glyph unicode="’" glyph-name="quoteright" horiz-adv-x="348" d="M309 1462L324 1440Q298 1340 249 1208T147 961H25Q95 1246 127 1462H309Z" /> -<glyph unicode="‚" glyph-name="quotesinglbase" horiz-adv-x="502" d="M350 238L365 215Q339 115 290 -17T188 -264H63Q90 -160 122 -7T168 238H350Z" /> -<glyph unicode="“" glyph-name="quotedblleft" horiz-adv-x="717" d="M406 961L391 983Q447 1198 569 1462H692Q662 1347 633 1203T590 961H406ZM37 961L25 983Q47 1073 96 1207T201 1462H324Q258 1208 221 961H37Z" /> -<glyph unicode="”" glyph-name="quotedblright" horiz-adv-x="717" d="M309 1462L324 1440Q298 1340 249 1208T147 961H25Q95 1246 127 1462H309ZM678 1462L692 1440Q668 1349 620 1216T516 961H391Q417 1061 450 1215T496 1462H678Z" /> -<glyph unicode="„" glyph-name="quotedblbase" horiz-adv-x="829" d="M309 238L324 216Q298 116 249 -16T147 -263H25Q95 22 127 238H309ZM678 238L692 216Q668 125 620 -8T516 -263H391Q417 -163 450 -9T496 238H678Z" /> -<glyph unicode="•" glyph-name="bullet" horiz-adv-x="770" d="M164 748Q164 869 220 932T385 995Q490 995 548 933T606 748Q606 629 549 565T385 500Q278 500 221 565T164 748Z" /> -<glyph unicode="‹" glyph-name="guilsinglleft" horiz-adv-x="623" d="M82 551L424 958L543 889L254 539L543 188L424 117L82 524V551Z" /> -<glyph unicode="›" glyph-name="guilsinglright" horiz-adv-x="623" d="M541 524L197 117L80 188L367 539L80 889L197 958L541 551V524Z" /> -<hkern g1="quotedbl" g2="A" k="143" /> -<hkern g1="quotedbl" g2="T" k="-41" /> -<hkern g1="quotedbl" g2="V" k="-41" /> -<hkern g1="quotedbl" g2="W" k="-41" /> -<hkern g1="quotedbl" g2="Y" k="-20" /> -<hkern g1="quotedbl" g2="a" k="82" /> -<hkern g1="quotedbl" g2="c" k="123" /> -<hkern g1="quotedbl" g2="d" k="123" /> -<hkern g1="quotedbl" g2="e" k="123" /> -<hkern g1="quotedbl" g2="g" k="61" /> -<hkern g1="quotedbl" g2="m" k="61" /> -<hkern g1="quotedbl" g2="n" k="61" /> -<hkern g1="quotedbl" g2="o" k="123" /> -<hkern g1="quotedbl" g2="p" k="61" /> -<hkern g1="quotedbl" g2="q" k="123" /> -<hkern g1="quotedbl" g2="r" k="61" /> -<hkern g1="quotedbl" g2="s" k="61" /> -<hkern g1="quotedbl" g2="u" k="61" /> -<hkern g1="quotedbl" g2="Agrave" k="143" /> -<hkern g1="quotedbl" g2="Aacute" k="143" /> -<hkern g1="quotedbl" g2="Acircumflex" k="143" /> -<hkern g1="quotedbl" g2="Atilde" k="143" /> -<hkern g1="quotedbl" g2="Adieresis" k="143" /> -<hkern g1="quotedbl" g2="Aring" k="143" /> -<hkern g1="quotedbl" g2="Yacute" k="-20" /> -<hkern g1="quotedbl" g2="agrave" k="123" /> -<hkern g1="quotedbl" g2="aacute" k="82" /> -<hkern g1="quotedbl" g2="acircumflex" k="82" /> -<hkern g1="quotedbl" g2="atilde" k="82" /> -<hkern g1="quotedbl" g2="adieresis" k="82" /> -<hkern g1="quotedbl" g2="aring" k="82" /> -<hkern g1="quotedbl" g2="ae" k="82" /> -<hkern g1="quotedbl" g2="ccedilla" k="123" /> -<hkern g1="quotedbl" g2="egrave" k="123" /> -<hkern g1="quotedbl" g2="eacute" k="123" /> -<hkern g1="quotedbl" g2="ecircumflex" k="123" /> -<hkern g1="quotedbl" g2="edieresis" k="123" /> -<hkern g1="quotedbl" g2="ograve" k="123" /> -<hkern g1="quotedbl" g2="oacute" k="123" /> -<hkern g1="quotedbl" g2="ocircumflex" k="123" /> -<hkern g1="quotedbl" g2="otilde" k="123" /> -<hkern g1="quotedbl" g2="odieresis" k="123" /> -<hkern g1="quotedbl" g2="oslash" k="123" /> -<hkern g1="quotedbl" g2="ugrave" k="61" /> -<hkern g1="quotedbl" g2="uacute" k="61" /> -<hkern g1="quotedbl" g2="ucircumflex" k="61" /> -<hkern g1="quotedbl" g2="udieresis" k="61" /> -<hkern g1="quotedbl" g2="oe" k="123" /> -<hkern g1="quotesingle" g2="A" k="143" /> -<hkern g1="quotesingle" g2="T" k="-41" /> -<hkern g1="quotesingle" g2="V" k="-41" /> -<hkern g1="quotesingle" g2="W" k="-41" /> -<hkern g1="quotesingle" g2="Y" k="-20" /> -<hkern g1="quotesingle" g2="a" k="82" /> -<hkern g1="quotesingle" g2="c" k="123" /> -<hkern g1="quotesingle" g2="d" k="123" /> -<hkern g1="quotesingle" g2="e" k="123" /> -<hkern g1="quotesingle" g2="g" k="61" /> -<hkern g1="quotesingle" g2="m" k="61" /> -<hkern g1="quotesingle" g2="n" k="61" /> -<hkern g1="quotesingle" g2="o" k="123" /> -<hkern g1="quotesingle" g2="p" k="61" /> -<hkern g1="quotesingle" g2="q" k="123" /> -<hkern g1="quotesingle" g2="r" k="61" /> -<hkern g1="quotesingle" g2="s" k="61" /> -<hkern g1="quotesingle" g2="u" k="61" /> -<hkern g1="quotesingle" g2="Agrave" k="143" /> -<hkern g1="quotesingle" g2="Aacute" k="143" /> -<hkern g1="quotesingle" g2="Acircumflex" k="143" /> -<hkern g1="quotesingle" g2="Atilde" k="143" /> -<hkern g1="quotesingle" g2="Adieresis" k="143" /> -<hkern g1="quotesingle" g2="Aring" k="143" /> -<hkern g1="quotesingle" g2="Yacute" k="-20" /> -<hkern g1="quotesingle" g2="agrave" k="123" /> -<hkern g1="quotesingle" g2="aacute" k="82" /> -<hkern g1="quotesingle" g2="acircumflex" k="82" /> -<hkern g1="quotesingle" g2="atilde" k="82" /> -<hkern g1="quotesingle" g2="adieresis" k="82" /> -<hkern g1="quotesingle" g2="aring" k="82" /> -<hkern g1="quotesingle" g2="ae" k="82" /> -<hkern g1="quotesingle" g2="ccedilla" k="123" /> -<hkern g1="quotesingle" g2="egrave" k="123" /> -<hkern g1="quotesingle" g2="eacute" k="123" /> -<hkern g1="quotesingle" g2="ecircumflex" k="123" /> -<hkern g1="quotesingle" g2="edieresis" k="123" /> -<hkern g1="quotesingle" g2="ograve" k="123" /> -<hkern g1="quotesingle" g2="oacute" k="123" /> -<hkern g1="quotesingle" g2="ocircumflex" k="123" /> -<hkern g1="quotesingle" g2="otilde" k="123" /> -<hkern g1="quotesingle" g2="odieresis" k="123" /> -<hkern g1="quotesingle" g2="oslash" k="123" /> -<hkern g1="quotesingle" g2="ugrave" k="61" /> -<hkern g1="quotesingle" g2="uacute" k="61" /> -<hkern g1="quotesingle" g2="ucircumflex" k="61" /> -<hkern g1="quotesingle" g2="udieresis" k="61" /> -<hkern g1="quotesingle" g2="oe" k="123" /> -<hkern g1="parenleft" g2="J" k="-184" /> -<hkern g1="comma" g2="C" k="102" /> -<hkern g1="comma" g2="G" k="102" /> -<hkern g1="comma" g2="O" k="102" /> -<hkern g1="comma" g2="Q" k="102" /> -<hkern g1="comma" g2="T" k="143" /> -<hkern g1="comma" g2="U" k="41" /> -<hkern g1="comma" g2="V" k="123" /> -<hkern g1="comma" g2="W" k="123" /> -<hkern g1="comma" g2="Y" k="123" /> -<hkern g1="comma" g2="Ccedilla" k="102" /> -<hkern g1="comma" g2="Ograve" k="102" /> -<hkern g1="comma" g2="Oacute" k="102" /> -<hkern g1="comma" g2="Ocircumflex" k="102" /> -<hkern g1="comma" g2="Otilde" k="102" /> -<hkern g1="comma" g2="Odieresis" k="102" /> -<hkern g1="comma" g2="Oslash" k="102" /> -<hkern g1="comma" g2="Ugrave" k="41" /> -<hkern g1="comma" g2="Uacute" k="41" /> -<hkern g1="comma" g2="Ucircumflex" k="41" /> -<hkern g1="comma" g2="Udieresis" k="41" /> -<hkern g1="comma" g2="Yacute" k="123" /> -<hkern g1="comma" g2="OE" k="102" /> -<hkern g1="hyphen" g2="T" k="82" /> -<hkern g1="period" g2="C" k="102" /> -<hkern g1="period" g2="G" k="102" /> -<hkern g1="period" g2="O" k="102" /> -<hkern g1="period" g2="Q" k="102" /> -<hkern g1="period" g2="T" k="143" /> -<hkern g1="period" g2="U" k="41" /> -<hkern g1="period" g2="V" k="123" /> -<hkern g1="period" g2="W" k="123" /> -<hkern g1="period" g2="Y" k="123" /> -<hkern g1="period" g2="Ccedilla" k="102" /> -<hkern g1="period" g2="Ograve" k="102" /> -<hkern g1="period" g2="Oacute" k="102" /> -<hkern g1="period" g2="Ocircumflex" k="102" /> -<hkern g1="period" g2="Otilde" k="102" /> -<hkern g1="period" g2="Odieresis" k="102" /> -<hkern g1="period" g2="Oslash" k="102" /> -<hkern g1="period" g2="Ugrave" k="41" /> -<hkern g1="period" g2="Uacute" k="41" /> -<hkern g1="period" g2="Ucircumflex" k="41" /> -<hkern g1="period" g2="Udieresis" k="41" /> -<hkern g1="period" g2="Yacute" k="123" /> -<hkern g1="period" g2="OE" k="102" /> -<hkern g1="A" g2="quotedbl" k="143" /> -<hkern g1="A" g2="quotesingle" k="143" /> -<hkern g1="A" g2="C" k="41" /> -<hkern g1="A" g2="G" k="41" /> -<hkern g1="A" g2="J" k="-266" /> -<hkern g1="A" g2="O" k="41" /> -<hkern g1="A" g2="Q" k="41" /> -<hkern g1="A" g2="T" k="143" /> -<hkern g1="A" g2="V" k="82" /> -<hkern g1="A" g2="W" k="82" /> -<hkern g1="A" g2="Y" k="123" /> -<hkern g1="A" g2="Ccedilla" k="41" /> -<hkern g1="A" g2="Ograve" k="41" /> -<hkern g1="A" g2="Oacute" k="41" /> -<hkern g1="A" g2="Ocircumflex" k="41" /> -<hkern g1="A" g2="Otilde" k="41" /> -<hkern g1="A" g2="Odieresis" k="41" /> -<hkern g1="A" g2="Oslash" k="41" /> -<hkern g1="A" g2="Yacute" k="123" /> -<hkern g1="A" g2="OE" k="41" /> -<hkern g1="A" g2="quoteright" k="143" /> -<hkern g1="A" g2="quotedblright" k="143" /> -<hkern g1="B" g2="comma" k="82" /> -<hkern g1="B" g2="period" k="82" /> -<hkern g1="B" g2="A" k="41" /> -<hkern g1="B" g2="T" k="61" /> -<hkern g1="B" g2="V" k="20" /> -<hkern g1="B" g2="W" k="20" /> -<hkern g1="B" g2="X" k="41" /> -<hkern g1="B" g2="Y" k="20" /> -<hkern g1="B" g2="Z" k="20" /> -<hkern g1="B" g2="Agrave" k="41" /> -<hkern g1="B" g2="Aacute" k="41" /> -<hkern g1="B" g2="Acircumflex" k="41" /> -<hkern g1="B" g2="Atilde" k="41" /> -<hkern g1="B" g2="Adieresis" k="41" /> -<hkern g1="B" g2="Aring" k="41" /> -<hkern g1="B" g2="Yacute" k="20" /> -<hkern g1="B" g2="quotesinglbase" k="82" /> -<hkern g1="B" g2="quotedblbase" k="82" /> -<hkern g1="C" g2="C" k="41" /> -<hkern g1="C" g2="G" k="41" /> -<hkern g1="C" g2="O" k="41" /> -<hkern g1="C" g2="Q" k="41" /> -<hkern g1="C" g2="Ccedilla" k="41" /> -<hkern g1="C" g2="Ograve" k="41" /> -<hkern g1="C" g2="Oacute" k="41" /> -<hkern g1="C" g2="Ocircumflex" k="41" /> -<hkern g1="C" g2="Otilde" k="41" /> -<hkern g1="C" g2="Odieresis" k="41" /> -<hkern g1="C" g2="Oslash" k="41" /> -<hkern g1="C" g2="OE" k="41" /> -<hkern g1="D" g2="comma" k="82" /> -<hkern g1="D" g2="period" k="82" /> -<hkern g1="D" g2="A" k="41" /> -<hkern g1="D" g2="T" k="61" /> -<hkern g1="D" g2="V" k="20" /> -<hkern g1="D" g2="W" k="20" /> -<hkern g1="D" g2="X" k="41" /> -<hkern g1="D" g2="Y" k="20" /> -<hkern g1="D" g2="Z" k="20" /> -<hkern g1="D" g2="Agrave" k="41" /> -<hkern g1="D" g2="Aacute" k="41" /> -<hkern g1="D" g2="Acircumflex" k="41" /> -<hkern g1="D" g2="Atilde" k="41" /> -<hkern g1="D" g2="Adieresis" k="41" /> -<hkern g1="D" g2="Aring" k="41" /> -<hkern g1="D" g2="Yacute" k="20" /> -<hkern g1="D" g2="quotesinglbase" k="82" /> -<hkern g1="D" g2="quotedblbase" k="82" /> -<hkern g1="E" g2="J" k="-123" /> -<hkern g1="F" g2="comma" k="123" /> -<hkern g1="F" g2="period" k="123" /> -<hkern g1="F" g2="question" k="-41" /> -<hkern g1="F" g2="A" k="41" /> -<hkern g1="F" g2="Agrave" k="41" /> -<hkern g1="F" g2="Aacute" k="41" /> -<hkern g1="F" g2="Acircumflex" k="41" /> -<hkern g1="F" g2="Atilde" k="41" /> -<hkern g1="F" g2="Adieresis" k="41" /> -<hkern g1="F" g2="Aring" k="41" /> -<hkern g1="F" g2="quotesinglbase" k="123" /> -<hkern g1="F" g2="quotedblbase" k="123" /> -<hkern g1="K" g2="C" k="41" /> -<hkern g1="K" g2="G" k="41" /> -<hkern g1="K" g2="O" k="41" /> -<hkern g1="K" g2="Q" k="41" /> -<hkern g1="K" g2="Ccedilla" k="41" /> -<hkern g1="K" g2="Ograve" k="41" /> -<hkern g1="K" g2="Oacute" k="41" /> -<hkern g1="K" g2="Ocircumflex" k="41" /> -<hkern g1="K" g2="Otilde" k="41" /> -<hkern g1="K" g2="Odieresis" k="41" /> -<hkern g1="K" g2="Oslash" k="41" /> -<hkern g1="K" g2="OE" k="41" /> -<hkern g1="L" g2="quotedbl" k="164" /> -<hkern g1="L" g2="quotesingle" k="164" /> -<hkern g1="L" g2="C" k="41" /> -<hkern g1="L" g2="G" k="41" /> -<hkern g1="L" g2="O" k="41" /> -<hkern g1="L" g2="Q" k="41" /> -<hkern g1="L" g2="T" k="41" /> -<hkern g1="L" g2="U" k="20" /> -<hkern g1="L" g2="V" k="41" /> -<hkern g1="L" g2="W" k="41" /> -<hkern g1="L" g2="Y" k="61" /> -<hkern g1="L" g2="Ccedilla" k="41" /> -<hkern g1="L" g2="Ograve" k="41" /> -<hkern g1="L" g2="Oacute" k="41" /> -<hkern g1="L" g2="Ocircumflex" k="41" /> -<hkern g1="L" g2="Otilde" k="41" /> -<hkern g1="L" g2="Odieresis" k="41" /> -<hkern g1="L" g2="Oslash" k="41" /> -<hkern g1="L" g2="Ugrave" k="20" /> -<hkern g1="L" g2="Uacute" k="20" /> -<hkern g1="L" g2="Ucircumflex" k="20" /> -<hkern g1="L" g2="Udieresis" k="20" /> -<hkern g1="L" g2="Yacute" k="61" /> -<hkern g1="L" g2="OE" k="41" /> -<hkern g1="L" g2="quoteright" k="164" /> -<hkern g1="L" g2="quotedblright" k="164" /> -<hkern g1="O" g2="comma" k="82" /> -<hkern g1="O" g2="period" k="82" /> -<hkern g1="O" g2="A" k="41" /> -<hkern g1="O" g2="T" k="61" /> -<hkern g1="O" g2="V" k="20" /> -<hkern g1="O" g2="W" k="20" /> -<hkern g1="O" g2="X" k="41" /> -<hkern g1="O" g2="Y" k="20" /> -<hkern g1="O" g2="Z" k="20" /> -<hkern g1="O" g2="Agrave" k="41" /> -<hkern g1="O" g2="Aacute" k="41" /> -<hkern g1="O" g2="Acircumflex" k="41" /> -<hkern g1="O" g2="Atilde" k="41" /> -<hkern g1="O" g2="Adieresis" k="41" /> -<hkern g1="O" g2="Aring" k="41" /> -<hkern g1="O" g2="Yacute" k="20" /> -<hkern g1="O" g2="quotesinglbase" k="82" /> -<hkern g1="O" g2="quotedblbase" k="82" /> -<hkern g1="P" g2="comma" k="266" /> -<hkern g1="P" g2="period" k="266" /> -<hkern g1="P" g2="A" k="102" /> -<hkern g1="P" g2="X" k="41" /> -<hkern g1="P" g2="Z" k="20" /> -<hkern g1="P" g2="Agrave" k="102" /> -<hkern g1="P" g2="Aacute" k="102" /> -<hkern g1="P" g2="Acircumflex" k="102" /> -<hkern g1="P" g2="Atilde" k="102" /> -<hkern g1="P" g2="Adieresis" k="102" /> -<hkern g1="P" g2="Aring" k="102" /> -<hkern g1="P" g2="quotesinglbase" k="266" /> -<hkern g1="P" g2="quotedblbase" k="266" /> -<hkern g1="Q" g2="comma" k="82" /> -<hkern g1="Q" g2="period" k="82" /> -<hkern g1="Q" g2="A" k="41" /> -<hkern g1="Q" g2="T" k="61" /> -<hkern g1="Q" g2="V" k="20" /> -<hkern g1="Q" g2="W" k="20" /> -<hkern g1="Q" g2="X" k="41" /> -<hkern g1="Q" g2="Y" k="20" /> -<hkern g1="Q" g2="Z" k="20" /> -<hkern g1="Q" g2="Agrave" k="41" /> -<hkern g1="Q" g2="Aacute" k="41" /> -<hkern g1="Q" g2="Acircumflex" k="41" /> -<hkern g1="Q" g2="Atilde" k="41" /> -<hkern g1="Q" g2="Adieresis" k="41" /> -<hkern g1="Q" g2="Aring" k="41" /> -<hkern g1="Q" g2="Yacute" k="20" /> -<hkern g1="Q" g2="quotesinglbase" k="82" /> -<hkern g1="Q" g2="quotedblbase" k="82" /> -<hkern g1="T" g2="comma" k="123" /> -<hkern g1="T" g2="hyphen" k="82" /> -<hkern g1="T" g2="period" k="123" /> -<hkern g1="T" g2="question" k="-41" /> -<hkern g1="T" g2="A" k="143" /> -<hkern g1="T" g2="C" k="41" /> -<hkern g1="T" g2="G" k="41" /> -<hkern g1="T" g2="O" k="41" /> -<hkern g1="T" g2="Q" k="41" /> -<hkern g1="T" g2="T" k="-41" /> -<hkern g1="T" g2="a" k="164" /> -<hkern g1="T" g2="c" k="143" /> -<hkern g1="T" g2="d" k="143" /> -<hkern g1="T" g2="e" k="143" /> -<hkern g1="T" g2="g" k="143" /> -<hkern g1="T" g2="m" k="102" /> -<hkern g1="T" g2="n" k="102" /> -<hkern g1="T" g2="o" k="143" /> -<hkern g1="T" g2="p" k="102" /> -<hkern g1="T" g2="q" k="143" /> -<hkern g1="T" g2="r" k="102" /> -<hkern g1="T" g2="s" k="123" /> -<hkern g1="T" g2="u" k="102" /> -<hkern g1="T" g2="v" k="41" /> -<hkern g1="T" g2="w" k="41" /> -<hkern g1="T" g2="x" k="41" /> -<hkern g1="T" g2="y" k="41" /> -<hkern g1="T" g2="z" k="82" /> -<hkern g1="T" g2="Agrave" k="143" /> -<hkern g1="T" g2="Aacute" k="143" /> -<hkern g1="T" g2="Acircumflex" k="143" /> -<hkern g1="T" g2="Atilde" k="143" /> -<hkern g1="T" g2="Adieresis" k="143" /> -<hkern g1="T" g2="Aring" k="143" /> -<hkern g1="T" g2="Ccedilla" k="41" /> -<hkern g1="T" g2="Ograve" k="41" /> -<hkern g1="T" g2="Oacute" k="41" /> -<hkern g1="T" g2="Ocircumflex" k="41" /> -<hkern g1="T" g2="Otilde" k="41" /> -<hkern g1="T" g2="Odieresis" k="41" /> -<hkern g1="T" g2="Oslash" k="41" /> -<hkern g1="T" g2="agrave" k="143" /> -<hkern g1="T" g2="aacute" k="164" /> -<hkern g1="T" g2="acircumflex" k="164" /> -<hkern g1="T" g2="atilde" k="164" /> -<hkern g1="T" g2="adieresis" k="164" /> -<hkern g1="T" g2="aring" k="164" /> -<hkern g1="T" g2="ae" k="164" /> -<hkern g1="T" g2="ccedilla" k="143" /> -<hkern g1="T" g2="egrave" k="143" /> -<hkern g1="T" g2="eacute" k="143" /> -<hkern g1="T" g2="ecircumflex" k="143" /> -<hkern g1="T" g2="edieresis" k="143" /> -<hkern g1="T" g2="ograve" k="143" /> -<hkern g1="T" g2="oacute" k="143" /> -<hkern g1="T" g2="ocircumflex" k="143" /> -<hkern g1="T" g2="otilde" k="143" /> -<hkern g1="T" g2="odieresis" k="143" /> -<hkern g1="T" g2="oslash" k="143" /> -<hkern g1="T" g2="ugrave" k="102" /> -<hkern g1="T" g2="uacute" k="102" /> -<hkern g1="T" g2="ucircumflex" k="102" /> -<hkern g1="T" g2="udieresis" k="102" /> -<hkern g1="T" g2="yacute" k="41" /> -<hkern g1="T" g2="OE" k="41" /> -<hkern g1="T" g2="oe" k="143" /> -<hkern g1="T" g2="endash" k="82" /> -<hkern g1="T" g2="emdash" k="82" /> -<hkern g1="T" g2="quotesinglbase" k="123" /> -<hkern g1="T" g2="quotedblbase" k="123" /> -<hkern g1="U" g2="comma" k="41" /> -<hkern g1="U" g2="period" k="41" /> -<hkern g1="U" g2="A" k="20" /> -<hkern g1="U" g2="Agrave" k="20" /> -<hkern g1="U" g2="Aacute" k="20" /> -<hkern g1="U" g2="Acircumflex" k="20" /> -<hkern g1="U" g2="Atilde" k="20" /> -<hkern g1="U" g2="Adieresis" k="20" /> -<hkern g1="U" g2="Aring" k="20" /> -<hkern g1="U" g2="quotesinglbase" k="41" /> -<hkern g1="U" g2="quotedblbase" k="41" /> -<hkern g1="V" g2="comma" k="102" /> -<hkern g1="V" g2="period" k="102" /> -<hkern g1="V" g2="question" k="-41" /> -<hkern g1="V" g2="A" k="82" /> -<hkern g1="V" g2="C" k="20" /> -<hkern g1="V" g2="G" k="20" /> -<hkern g1="V" g2="O" k="20" /> -<hkern g1="V" g2="Q" k="20" /> -<hkern g1="V" g2="a" k="41" /> -<hkern g1="V" g2="c" k="41" /> -<hkern g1="V" g2="d" k="41" /> -<hkern g1="V" g2="e" k="41" /> -<hkern g1="V" g2="g" k="20" /> -<hkern g1="V" g2="m" k="20" /> -<hkern g1="V" g2="n" k="20" /> -<hkern g1="V" g2="o" k="41" /> -<hkern g1="V" g2="p" k="20" /> -<hkern g1="V" g2="q" k="41" /> -<hkern g1="V" g2="r" k="20" /> -<hkern g1="V" g2="s" k="20" /> -<hkern g1="V" g2="u" k="20" /> -<hkern g1="V" g2="Agrave" k="82" /> -<hkern g1="V" g2="Aacute" k="82" /> -<hkern g1="V" g2="Acircumflex" k="82" /> -<hkern g1="V" g2="Atilde" k="82" /> -<hkern g1="V" g2="Adieresis" k="82" /> -<hkern g1="V" g2="Aring" k="82" /> -<hkern g1="V" g2="Ccedilla" k="20" /> -<hkern g1="V" g2="Ograve" k="20" /> -<hkern g1="V" g2="Oacute" k="20" /> -<hkern g1="V" g2="Ocircumflex" k="20" /> -<hkern g1="V" g2="Otilde" k="20" /> -<hkern g1="V" g2="Odieresis" k="20" /> -<hkern g1="V" g2="Oslash" k="20" /> -<hkern g1="V" g2="agrave" k="41" /> -<hkern g1="V" g2="aacute" k="41" /> -<hkern g1="V" g2="acircumflex" k="41" /> -<hkern g1="V" g2="atilde" k="41" /> -<hkern g1="V" g2="adieresis" k="41" /> -<hkern g1="V" g2="aring" k="41" /> -<hkern g1="V" g2="ae" k="41" /> -<hkern g1="V" g2="ccedilla" k="41" /> -<hkern g1="V" g2="egrave" k="41" /> -<hkern g1="V" g2="eacute" k="41" /> -<hkern g1="V" g2="ecircumflex" k="41" /> -<hkern g1="V" g2="edieresis" k="41" /> -<hkern g1="V" g2="ograve" k="41" /> -<hkern g1="V" g2="oacute" k="41" /> -<hkern g1="V" g2="ocircumflex" k="41" /> -<hkern g1="V" g2="otilde" k="41" /> -<hkern g1="V" g2="odieresis" k="41" /> -<hkern g1="V" g2="oslash" k="41" /> -<hkern g1="V" g2="ugrave" k="20" /> -<hkern g1="V" g2="uacute" k="20" /> -<hkern g1="V" g2="ucircumflex" k="20" /> -<hkern g1="V" g2="udieresis" k="20" /> -<hkern g1="V" g2="OE" k="20" /> -<hkern g1="V" g2="oe" k="41" /> -<hkern g1="V" g2="quotesinglbase" k="102" /> -<hkern g1="V" g2="quotedblbase" k="102" /> -<hkern g1="W" g2="comma" k="102" /> -<hkern g1="W" g2="period" k="102" /> -<hkern g1="W" g2="question" k="-41" /> -<hkern g1="W" g2="A" k="82" /> -<hkern g1="W" g2="C" k="20" /> -<hkern g1="W" g2="G" k="20" /> -<hkern g1="W" g2="O" k="20" /> -<hkern g1="W" g2="Q" k="20" /> -<hkern g1="W" g2="a" k="41" /> -<hkern g1="W" g2="c" k="41" /> -<hkern g1="W" g2="d" k="41" /> -<hkern g1="W" g2="e" k="41" /> -<hkern g1="W" g2="g" k="20" /> -<hkern g1="W" g2="m" k="20" /> -<hkern g1="W" g2="n" k="20" /> -<hkern g1="W" g2="o" k="41" /> -<hkern g1="W" g2="p" k="20" /> -<hkern g1="W" g2="q" k="41" /> -<hkern g1="W" g2="r" k="20" /> -<hkern g1="W" g2="s" k="20" /> -<hkern g1="W" g2="u" k="20" /> -<hkern g1="W" g2="Agrave" k="82" /> -<hkern g1="W" g2="Aacute" k="82" /> -<hkern g1="W" g2="Acircumflex" k="82" /> -<hkern g1="W" g2="Atilde" k="82" /> -<hkern g1="W" g2="Adieresis" k="82" /> -<hkern g1="W" g2="Aring" k="82" /> -<hkern g1="W" g2="Ccedilla" k="20" /> -<hkern g1="W" g2="Ograve" k="20" /> -<hkern g1="W" g2="Oacute" k="20" /> -<hkern g1="W" g2="Ocircumflex" k="20" /> -<hkern g1="W" g2="Otilde" k="20" /> -<hkern g1="W" g2="Odieresis" k="20" /> -<hkern g1="W" g2="Oslash" k="20" /> -<hkern g1="W" g2="agrave" k="41" /> -<hkern g1="W" g2="aacute" k="41" /> -<hkern g1="W" g2="acircumflex" k="41" /> -<hkern g1="W" g2="atilde" k="41" /> -<hkern g1="W" g2="adieresis" k="41" /> -<hkern g1="W" g2="aring" k="41" /> -<hkern g1="W" g2="ae" k="41" /> -<hkern g1="W" g2="ccedilla" k="41" /> -<hkern g1="W" g2="egrave" k="41" /> -<hkern g1="W" g2="eacute" k="41" /> -<hkern g1="W" g2="ecircumflex" k="41" /> -<hkern g1="W" g2="edieresis" k="41" /> -<hkern g1="W" g2="ograve" k="41" /> -<hkern g1="W" g2="oacute" k="41" /> -<hkern g1="W" g2="ocircumflex" k="41" /> -<hkern g1="W" g2="otilde" k="41" /> -<hkern g1="W" g2="odieresis" k="41" /> -<hkern g1="W" g2="oslash" k="41" /> -<hkern g1="W" g2="ugrave" k="20" /> -<hkern g1="W" g2="uacute" k="20" /> -<hkern g1="W" g2="ucircumflex" k="20" /> -<hkern g1="W" g2="udieresis" k="20" /> -<hkern g1="W" g2="OE" k="20" /> -<hkern g1="W" g2="oe" k="41" /> -<hkern g1="W" g2="quotesinglbase" k="102" /> -<hkern g1="W" g2="quotedblbase" k="102" /> -<hkern g1="X" g2="C" k="41" /> -<hkern g1="X" g2="G" k="41" /> -<hkern g1="X" g2="O" k="41" /> -<hkern g1="X" g2="Q" k="41" /> -<hkern g1="X" g2="Ccedilla" k="41" /> -<hkern g1="X" g2="Ograve" k="41" /> -<hkern g1="X" g2="Oacute" k="41" /> -<hkern g1="X" g2="Ocircumflex" k="41" /> -<hkern g1="X" g2="Otilde" k="41" /> -<hkern g1="X" g2="Odieresis" k="41" /> -<hkern g1="X" g2="Oslash" k="41" /> -<hkern g1="X" g2="OE" k="41" /> -<hkern g1="Y" g2="comma" k="123" /> -<hkern g1="Y" g2="period" k="123" /> -<hkern g1="Y" g2="question" k="-41" /> -<hkern g1="Y" g2="A" k="123" /> -<hkern g1="Y" g2="C" k="41" /> -<hkern g1="Y" g2="G" k="41" /> -<hkern g1="Y" g2="O" k="41" /> -<hkern g1="Y" g2="Q" k="41" /> -<hkern g1="Y" g2="a" k="102" /> -<hkern g1="Y" g2="c" k="102" /> -<hkern g1="Y" g2="d" k="102" /> -<hkern g1="Y" g2="e" k="102" /> -<hkern g1="Y" g2="g" k="41" /> -<hkern g1="Y" g2="m" k="61" /> -<hkern g1="Y" g2="n" k="61" /> -<hkern g1="Y" g2="o" k="102" /> -<hkern g1="Y" g2="p" k="61" /> -<hkern g1="Y" g2="q" k="102" /> -<hkern g1="Y" g2="r" k="61" /> -<hkern g1="Y" g2="s" k="82" /> -<hkern g1="Y" g2="u" k="61" /> -<hkern g1="Y" g2="z" k="41" /> -<hkern g1="Y" g2="Agrave" k="123" /> -<hkern g1="Y" g2="Aacute" k="123" /> -<hkern g1="Y" g2="Acircumflex" k="123" /> -<hkern g1="Y" g2="Atilde" k="123" /> -<hkern g1="Y" g2="Adieresis" k="123" /> -<hkern g1="Y" g2="Aring" k="123" /> -<hkern g1="Y" g2="Ccedilla" k="41" /> -<hkern g1="Y" g2="Ograve" k="41" /> -<hkern g1="Y" g2="Oacute" k="41" /> -<hkern g1="Y" g2="Ocircumflex" k="41" /> -<hkern g1="Y" g2="Otilde" k="41" /> -<hkern g1="Y" g2="Odieresis" k="41" /> -<hkern g1="Y" g2="Oslash" k="41" /> -<hkern g1="Y" g2="agrave" k="102" /> -<hkern g1="Y" g2="aacute" k="102" /> -<hkern g1="Y" g2="acircumflex" k="102" /> -<hkern g1="Y" g2="atilde" k="102" /> -<hkern g1="Y" g2="adieresis" k="102" /> -<hkern g1="Y" g2="aring" k="102" /> -<hkern g1="Y" g2="ae" k="102" /> -<hkern g1="Y" g2="ccedilla" k="102" /> -<hkern g1="Y" g2="egrave" k="102" /> -<hkern g1="Y" g2="eacute" k="102" /> -<hkern g1="Y" g2="ecircumflex" k="102" /> -<hkern g1="Y" g2="edieresis" k="102" /> -<hkern g1="Y" g2="ograve" k="102" /> -<hkern g1="Y" g2="oacute" k="102" /> -<hkern g1="Y" g2="ocircumflex" k="102" /> -<hkern g1="Y" g2="otilde" k="102" /> -<hkern g1="Y" g2="odieresis" k="102" /> -<hkern g1="Y" g2="oslash" k="102" /> -<hkern g1="Y" g2="ugrave" k="61" /> -<hkern g1="Y" g2="uacute" k="61" /> -<hkern g1="Y" g2="ucircumflex" k="61" /> -<hkern g1="Y" g2="udieresis" k="61" /> -<hkern g1="Y" g2="OE" k="41" /> -<hkern g1="Y" g2="oe" k="102" /> -<hkern g1="Y" g2="quotesinglbase" k="123" /> -<hkern g1="Y" g2="quotedblbase" k="123" /> -<hkern g1="Z" g2="C" k="20" /> -<hkern g1="Z" g2="G" k="20" /> -<hkern g1="Z" g2="O" k="20" /> -<hkern g1="Z" g2="Q" k="20" /> -<hkern g1="Z" g2="Ccedilla" k="20" /> -<hkern g1="Z" g2="Ograve" k="20" /> -<hkern g1="Z" g2="Oacute" k="20" /> -<hkern g1="Z" g2="Ocircumflex" k="20" /> -<hkern g1="Z" g2="Otilde" k="20" /> -<hkern g1="Z" g2="Odieresis" k="20" /> -<hkern g1="Z" g2="Oslash" k="20" /> -<hkern g1="Z" g2="OE" k="20" /> -<hkern g1="bracketleft" g2="J" k="-184" /> -<hkern g1="a" g2="quotedbl" k="20" /> -<hkern g1="a" g2="quotesingle" k="20" /> -<hkern g1="a" g2="quoteright" k="20" /> -<hkern g1="a" g2="quotedblright" k="20" /> -<hkern g1="b" g2="quotedbl" k="20" /> -<hkern g1="b" g2="quotesingle" k="20" /> -<hkern g1="b" g2="v" k="41" /> -<hkern g1="b" g2="w" k="41" /> -<hkern g1="b" g2="x" k="41" /> -<hkern g1="b" g2="y" k="41" /> -<hkern g1="b" g2="z" k="20" /> -<hkern g1="b" g2="yacute" k="41" /> -<hkern g1="b" g2="quoteright" k="20" /> -<hkern g1="b" g2="quotedblright" k="20" /> -<hkern g1="c" g2="quotedbl" k="-41" /> -<hkern g1="c" g2="quotesingle" k="-41" /> -<hkern g1="c" g2="quoteright" k="-41" /> -<hkern g1="c" g2="quotedblright" k="-41" /> -<hkern g1="e" g2="quotedbl" k="20" /> -<hkern g1="e" g2="quotesingle" k="20" /> -<hkern g1="e" g2="v" k="41" /> -<hkern g1="e" g2="w" k="41" /> -<hkern g1="e" g2="x" k="41" /> -<hkern g1="e" g2="y" k="41" /> -<hkern g1="e" g2="z" k="20" /> -<hkern g1="e" g2="yacute" k="41" /> -<hkern g1="e" g2="quoteright" k="20" /> -<hkern g1="e" g2="quotedblright" k="20" /> -<hkern g1="f" g2="quotedbl" k="-123" /> -<hkern g1="f" g2="quotesingle" k="-123" /> -<hkern g1="f" g2="quoteright" k="-123" /> -<hkern g1="f" g2="quotedblright" k="-123" /> -<hkern g1="h" g2="quotedbl" k="20" /> -<hkern g1="h" g2="quotesingle" k="20" /> -<hkern g1="h" g2="quoteright" k="20" /> -<hkern g1="h" g2="quotedblright" k="20" /> -<hkern g1="k" g2="c" k="41" /> -<hkern g1="k" g2="d" k="41" /> -<hkern g1="k" g2="e" k="41" /> -<hkern g1="k" g2="o" k="41" /> -<hkern g1="k" g2="q" k="41" /> -<hkern g1="k" g2="agrave" k="41" /> -<hkern g1="k" g2="ccedilla" k="41" /> -<hkern g1="k" g2="egrave" k="41" /> -<hkern g1="k" g2="eacute" k="41" /> -<hkern g1="k" g2="ecircumflex" k="41" /> -<hkern g1="k" g2="edieresis" k="41" /> -<hkern g1="k" g2="ograve" k="41" /> -<hkern g1="k" g2="oacute" k="41" /> -<hkern g1="k" g2="ocircumflex" k="41" /> -<hkern g1="k" g2="otilde" k="41" /> -<hkern g1="k" g2="odieresis" k="41" /> -<hkern g1="k" g2="oslash" k="41" /> -<hkern g1="k" g2="oe" k="41" /> -<hkern g1="m" g2="quotedbl" k="20" /> -<hkern g1="m" g2="quotesingle" k="20" /> -<hkern g1="m" g2="quoteright" k="20" /> -<hkern g1="m" g2="quotedblright" k="20" /> -<hkern g1="n" g2="quotedbl" k="20" /> -<hkern g1="n" g2="quotesingle" k="20" /> -<hkern g1="n" g2="quoteright" k="20" /> -<hkern g1="n" g2="quotedblright" k="20" /> -<hkern g1="o" g2="quotedbl" k="20" /> -<hkern g1="o" g2="quotesingle" k="20" /> -<hkern g1="o" g2="v" k="41" /> -<hkern g1="o" g2="w" k="41" /> -<hkern g1="o" g2="x" k="41" /> -<hkern g1="o" g2="y" k="41" /> -<hkern g1="o" g2="z" k="20" /> -<hkern g1="o" g2="yacute" k="41" /> -<hkern g1="o" g2="quoteright" k="20" /> -<hkern g1="o" g2="quotedblright" k="20" /> -<hkern g1="p" g2="quotedbl" k="20" /> -<hkern g1="p" g2="quotesingle" k="20" /> -<hkern g1="p" g2="v" k="41" /> -<hkern g1="p" g2="w" k="41" /> -<hkern g1="p" g2="x" k="41" /> -<hkern g1="p" g2="y" k="41" /> -<hkern g1="p" g2="z" k="20" /> -<hkern g1="p" g2="yacute" k="41" /> -<hkern g1="p" g2="quoteright" k="20" /> -<hkern g1="p" g2="quotedblright" k="20" /> -<hkern g1="r" g2="quotedbl" k="-82" /> -<hkern g1="r" g2="quotesingle" k="-82" /> -<hkern g1="r" g2="a" k="41" /> -<hkern g1="r" g2="c" k="41" /> -<hkern g1="r" g2="d" k="41" /> -<hkern g1="r" g2="e" k="41" /> -<hkern g1="r" g2="g" k="20" /> -<hkern g1="r" g2="o" k="41" /> -<hkern g1="r" g2="q" k="41" /> -<hkern g1="r" g2="agrave" k="41" /> -<hkern g1="r" g2="aacute" k="41" /> -<hkern g1="r" g2="acircumflex" k="41" /> -<hkern g1="r" g2="atilde" k="41" /> -<hkern g1="r" g2="adieresis" k="41" /> -<hkern g1="r" g2="aring" k="41" /> -<hkern g1="r" g2="ae" k="41" /> -<hkern g1="r" g2="ccedilla" k="41" /> -<hkern g1="r" g2="egrave" k="41" /> -<hkern g1="r" g2="eacute" k="41" /> -<hkern g1="r" g2="ecircumflex" k="41" /> -<hkern g1="r" g2="edieresis" k="41" /> -<hkern g1="r" g2="ograve" k="41" /> -<hkern g1="r" g2="oacute" k="41" /> -<hkern g1="r" g2="ocircumflex" k="41" /> -<hkern g1="r" g2="otilde" k="41" /> -<hkern g1="r" g2="odieresis" k="41" /> -<hkern g1="r" g2="oslash" k="41" /> -<hkern g1="r" g2="oe" k="41" /> -<hkern g1="r" g2="quoteright" k="-82" /> -<hkern g1="r" g2="quotedblright" k="-82" /> -<hkern g1="t" g2="quotedbl" k="-41" /> -<hkern g1="t" g2="quotesingle" k="-41" /> -<hkern g1="t" g2="quoteright" k="-41" /> -<hkern g1="t" g2="quotedblright" k="-41" /> -<hkern g1="v" g2="quotedbl" k="-82" /> -<hkern g1="v" g2="quotesingle" k="-82" /> -<hkern g1="v" g2="comma" k="82" /> -<hkern g1="v" g2="period" k="82" /> -<hkern g1="v" g2="question" k="-41" /> -<hkern g1="v" g2="quoteright" k="-82" /> -<hkern g1="v" g2="quotesinglbase" k="82" /> -<hkern g1="v" g2="quotedblright" k="-82" /> -<hkern g1="v" g2="quotedblbase" k="82" /> -<hkern g1="w" g2="quotedbl" k="-82" /> -<hkern g1="w" g2="quotesingle" k="-82" /> -<hkern g1="w" g2="comma" k="82" /> -<hkern g1="w" g2="period" k="82" /> -<hkern g1="w" g2="question" k="-41" /> -<hkern g1="w" g2="quoteright" k="-82" /> -<hkern g1="w" g2="quotesinglbase" k="82" /> -<hkern g1="w" g2="quotedblright" k="-82" /> -<hkern g1="w" g2="quotedblbase" k="82" /> -<hkern g1="x" g2="c" k="41" /> -<hkern g1="x" g2="d" k="41" /> -<hkern g1="x" g2="e" k="41" /> -<hkern g1="x" g2="o" k="41" /> -<hkern g1="x" g2="q" k="41" /> -<hkern g1="x" g2="agrave" k="41" /> -<hkern g1="x" g2="ccedilla" k="41" /> -<hkern g1="x" g2="egrave" k="41" /> -<hkern g1="x" g2="eacute" k="41" /> -<hkern g1="x" g2="ecircumflex" k="41" /> -<hkern g1="x" g2="edieresis" k="41" /> -<hkern g1="x" g2="ograve" k="41" /> -<hkern g1="x" g2="oacute" k="41" /> -<hkern g1="x" g2="ocircumflex" k="41" /> -<hkern g1="x" g2="otilde" k="41" /> -<hkern g1="x" g2="odieresis" k="41" /> -<hkern g1="x" g2="oslash" k="41" /> -<hkern g1="x" g2="oe" k="41" /> -<hkern g1="y" g2="quotedbl" k="-82" /> -<hkern g1="y" g2="quotesingle" k="-82" /> -<hkern g1="y" g2="comma" k="82" /> -<hkern g1="y" g2="period" k="82" /> -<hkern g1="y" g2="question" k="-41" /> -<hkern g1="y" g2="quoteright" k="-82" /> -<hkern g1="y" g2="quotesinglbase" k="82" /> -<hkern g1="y" g2="quotedblright" k="-82" /> -<hkern g1="y" g2="quotedblbase" k="82" /> -<hkern g1="braceleft" g2="J" k="-184" /> -<hkern g1="Agrave" g2="quotedbl" k="143" /> -<hkern g1="Agrave" g2="quotesingle" k="143" /> -<hkern g1="Agrave" g2="C" k="41" /> -<hkern g1="Agrave" g2="G" k="41" /> -<hkern g1="Agrave" g2="J" k="-266" /> -<hkern g1="Agrave" g2="O" k="41" /> -<hkern g1="Agrave" g2="Q" k="41" /> -<hkern g1="Agrave" g2="T" k="143" /> -<hkern g1="Agrave" g2="V" k="82" /> -<hkern g1="Agrave" g2="W" k="82" /> -<hkern g1="Agrave" g2="Y" k="123" /> -<hkern g1="Agrave" g2="Ccedilla" k="41" /> -<hkern g1="Agrave" g2="Ograve" k="41" /> -<hkern g1="Agrave" g2="Oacute" k="41" /> -<hkern g1="Agrave" g2="Ocircumflex" k="41" /> -<hkern g1="Agrave" g2="Otilde" k="41" /> -<hkern g1="Agrave" g2="Odieresis" k="41" /> -<hkern g1="Agrave" g2="Oslash" k="41" /> -<hkern g1="Agrave" g2="Yacute" k="123" /> -<hkern g1="Agrave" g2="OE" k="41" /> -<hkern g1="Agrave" g2="quoteright" k="143" /> -<hkern g1="Agrave" g2="quotedblright" k="143" /> -<hkern g1="Aacute" g2="quotedbl" k="143" /> -<hkern g1="Aacute" g2="quotesingle" k="143" /> -<hkern g1="Aacute" g2="C" k="41" /> -<hkern g1="Aacute" g2="G" k="41" /> -<hkern g1="Aacute" g2="J" k="-266" /> -<hkern g1="Aacute" g2="O" k="41" /> -<hkern g1="Aacute" g2="Q" k="41" /> -<hkern g1="Aacute" g2="T" k="143" /> -<hkern g1="Aacute" g2="V" k="82" /> -<hkern g1="Aacute" g2="W" k="82" /> -<hkern g1="Aacute" g2="Y" k="123" /> -<hkern g1="Aacute" g2="Ccedilla" k="41" /> -<hkern g1="Aacute" g2="Ograve" k="41" /> -<hkern g1="Aacute" g2="Oacute" k="41" /> -<hkern g1="Aacute" g2="Ocircumflex" k="41" /> -<hkern g1="Aacute" g2="Otilde" k="41" /> -<hkern g1="Aacute" g2="Odieresis" k="41" /> -<hkern g1="Aacute" g2="Oslash" k="41" /> -<hkern g1="Aacute" g2="Yacute" k="123" /> -<hkern g1="Aacute" g2="OE" k="41" /> -<hkern g1="Aacute" g2="quoteright" k="143" /> -<hkern g1="Aacute" g2="quotedblright" k="143" /> -<hkern g1="Acircumflex" g2="quotedbl" k="143" /> -<hkern g1="Acircumflex" g2="quotesingle" k="143" /> -<hkern g1="Acircumflex" g2="C" k="41" /> -<hkern g1="Acircumflex" g2="G" k="41" /> -<hkern g1="Acircumflex" g2="J" k="-266" /> -<hkern g1="Acircumflex" g2="O" k="41" /> -<hkern g1="Acircumflex" g2="Q" k="41" /> -<hkern g1="Acircumflex" g2="T" k="143" /> -<hkern g1="Acircumflex" g2="V" k="82" /> -<hkern g1="Acircumflex" g2="W" k="82" /> -<hkern g1="Acircumflex" g2="Y" k="123" /> -<hkern g1="Acircumflex" g2="Ccedilla" k="41" /> -<hkern g1="Acircumflex" g2="Ograve" k="41" /> -<hkern g1="Acircumflex" g2="Oacute" k="41" /> -<hkern g1="Acircumflex" g2="Ocircumflex" k="41" /> -<hkern g1="Acircumflex" g2="Otilde" k="41" /> -<hkern g1="Acircumflex" g2="Odieresis" k="41" /> -<hkern g1="Acircumflex" g2="Oslash" k="41" /> -<hkern g1="Acircumflex" g2="Yacute" k="123" /> -<hkern g1="Acircumflex" g2="OE" k="41" /> -<hkern g1="Acircumflex" g2="quoteright" k="143" /> -<hkern g1="Acircumflex" g2="quotedblright" k="143" /> -<hkern g1="Atilde" g2="quotedbl" k="143" /> -<hkern g1="Atilde" g2="quotesingle" k="143" /> -<hkern g1="Atilde" g2="C" k="41" /> -<hkern g1="Atilde" g2="G" k="41" /> -<hkern g1="Atilde" g2="J" k="-266" /> -<hkern g1="Atilde" g2="O" k="41" /> -<hkern g1="Atilde" g2="Q" k="41" /> -<hkern g1="Atilde" g2="T" k="143" /> -<hkern g1="Atilde" g2="V" k="82" /> -<hkern g1="Atilde" g2="W" k="82" /> -<hkern g1="Atilde" g2="Y" k="123" /> -<hkern g1="Atilde" g2="Ccedilla" k="41" /> -<hkern g1="Atilde" g2="Ograve" k="41" /> -<hkern g1="Atilde" g2="Oacute" k="41" /> -<hkern g1="Atilde" g2="Ocircumflex" k="41" /> -<hkern g1="Atilde" g2="Otilde" k="41" /> -<hkern g1="Atilde" g2="Odieresis" k="41" /> -<hkern g1="Atilde" g2="Oslash" k="41" /> -<hkern g1="Atilde" g2="Yacute" k="123" /> -<hkern g1="Atilde" g2="OE" k="41" /> -<hkern g1="Atilde" g2="quoteright" k="143" /> -<hkern g1="Atilde" g2="quotedblright" k="143" /> -<hkern g1="Adieresis" g2="quotedbl" k="143" /> -<hkern g1="Adieresis" g2="quotesingle" k="143" /> -<hkern g1="Adieresis" g2="C" k="41" /> -<hkern g1="Adieresis" g2="G" k="41" /> -<hkern g1="Adieresis" g2="J" k="-266" /> -<hkern g1="Adieresis" g2="O" k="41" /> -<hkern g1="Adieresis" g2="Q" k="41" /> -<hkern g1="Adieresis" g2="T" k="143" /> -<hkern g1="Adieresis" g2="V" k="82" /> -<hkern g1="Adieresis" g2="W" k="82" /> -<hkern g1="Adieresis" g2="Y" k="123" /> -<hkern g1="Adieresis" g2="Ccedilla" k="41" /> -<hkern g1="Adieresis" g2="Ograve" k="41" /> -<hkern g1="Adieresis" g2="Oacute" k="41" /> -<hkern g1="Adieresis" g2="Ocircumflex" k="41" /> -<hkern g1="Adieresis" g2="Otilde" k="41" /> -<hkern g1="Adieresis" g2="Odieresis" k="41" /> -<hkern g1="Adieresis" g2="Oslash" k="41" /> -<hkern g1="Adieresis" g2="Yacute" k="123" /> -<hkern g1="Adieresis" g2="OE" k="41" /> -<hkern g1="Adieresis" g2="quoteright" k="143" /> -<hkern g1="Adieresis" g2="quotedblright" k="143" /> -<hkern g1="Aring" g2="quotedbl" k="143" /> -<hkern g1="Aring" g2="quotesingle" k="143" /> -<hkern g1="Aring" g2="C" k="41" /> -<hkern g1="Aring" g2="G" k="41" /> -<hkern g1="Aring" g2="J" k="-266" /> -<hkern g1="Aring" g2="O" k="41" /> -<hkern g1="Aring" g2="Q" k="41" /> -<hkern g1="Aring" g2="T" k="143" /> -<hkern g1="Aring" g2="V" k="82" /> -<hkern g1="Aring" g2="W" k="82" /> -<hkern g1="Aring" g2="Y" k="123" /> -<hkern g1="Aring" g2="Ccedilla" k="41" /> -<hkern g1="Aring" g2="Ograve" k="41" /> -<hkern g1="Aring" g2="Oacute" k="41" /> -<hkern g1="Aring" g2="Ocircumflex" k="41" /> -<hkern g1="Aring" g2="Otilde" k="41" /> -<hkern g1="Aring" g2="Odieresis" k="41" /> -<hkern g1="Aring" g2="Oslash" k="41" /> -<hkern g1="Aring" g2="Yacute" k="123" /> -<hkern g1="Aring" g2="OE" k="41" /> -<hkern g1="Aring" g2="quoteright" k="143" /> -<hkern g1="Aring" g2="quotedblright" k="143" /> -<hkern g1="AE" g2="J" k="-123" /> -<hkern g1="Ccedilla" g2="C" k="41" /> -<hkern g1="Ccedilla" g2="G" k="41" /> -<hkern g1="Ccedilla" g2="O" k="41" /> -<hkern g1="Ccedilla" g2="Q" k="41" /> -<hkern g1="Ccedilla" g2="Ccedilla" k="41" /> -<hkern g1="Ccedilla" g2="Ograve" k="41" /> -<hkern g1="Ccedilla" g2="Oacute" k="41" /> -<hkern g1="Ccedilla" g2="Ocircumflex" k="41" /> -<hkern g1="Ccedilla" g2="Otilde" k="41" /> -<hkern g1="Ccedilla" g2="Odieresis" k="41" /> -<hkern g1="Ccedilla" g2="Oslash" k="41" /> -<hkern g1="Ccedilla" g2="OE" k="41" /> -<hkern g1="Egrave" g2="J" k="-123" /> -<hkern g1="Eacute" g2="J" k="-123" /> -<hkern g1="Ecircumflex" g2="J" k="-123" /> -<hkern g1="Edieresis" g2="J" k="-123" /> -<hkern g1="Eth" g2="comma" k="82" /> -<hkern g1="Eth" g2="period" k="82" /> -<hkern g1="Eth" g2="A" k="41" /> -<hkern g1="Eth" g2="T" k="61" /> -<hkern g1="Eth" g2="V" k="20" /> -<hkern g1="Eth" g2="W" k="20" /> -<hkern g1="Eth" g2="X" k="41" /> -<hkern g1="Eth" g2="Y" k="20" /> -<hkern g1="Eth" g2="Z" k="20" /> -<hkern g1="Eth" g2="Agrave" k="41" /> -<hkern g1="Eth" g2="Aacute" k="41" /> -<hkern g1="Eth" g2="Acircumflex" k="41" /> -<hkern g1="Eth" g2="Atilde" k="41" /> -<hkern g1="Eth" g2="Adieresis" k="41" /> -<hkern g1="Eth" g2="Aring" k="41" /> -<hkern g1="Eth" g2="Yacute" k="20" /> -<hkern g1="Eth" g2="quotesinglbase" k="82" /> -<hkern g1="Eth" g2="quotedblbase" k="82" /> -<hkern g1="Ograve" g2="comma" k="82" /> -<hkern g1="Ograve" g2="period" k="82" /> -<hkern g1="Ograve" g2="A" k="41" /> -<hkern g1="Ograve" g2="T" k="61" /> -<hkern g1="Ograve" g2="V" k="20" /> -<hkern g1="Ograve" g2="W" k="20" /> -<hkern g1="Ograve" g2="X" k="41" /> -<hkern g1="Ograve" g2="Y" k="20" /> -<hkern g1="Ograve" g2="Z" k="20" /> -<hkern g1="Ograve" g2="Agrave" k="41" /> -<hkern g1="Ograve" g2="Aacute" k="41" /> -<hkern g1="Ograve" g2="Acircumflex" k="41" /> -<hkern g1="Ograve" g2="Atilde" k="41" /> -<hkern g1="Ograve" g2="Adieresis" k="41" /> -<hkern g1="Ograve" g2="Aring" k="41" /> -<hkern g1="Ograve" g2="Yacute" k="20" /> -<hkern g1="Ograve" g2="quotesinglbase" k="82" /> -<hkern g1="Ograve" g2="quotedblbase" k="82" /> -<hkern g1="Oacute" g2="comma" k="82" /> -<hkern g1="Oacute" g2="period" k="82" /> -<hkern g1="Oacute" g2="A" k="41" /> -<hkern g1="Oacute" g2="T" k="61" /> -<hkern g1="Oacute" g2="V" k="20" /> -<hkern g1="Oacute" g2="W" k="20" /> -<hkern g1="Oacute" g2="X" k="41" /> -<hkern g1="Oacute" g2="Y" k="20" /> -<hkern g1="Oacute" g2="Z" k="20" /> -<hkern g1="Oacute" g2="Agrave" k="41" /> -<hkern g1="Oacute" g2="Aacute" k="41" /> -<hkern g1="Oacute" g2="Acircumflex" k="41" /> -<hkern g1="Oacute" g2="Atilde" k="41" /> -<hkern g1="Oacute" g2="Adieresis" k="41" /> -<hkern g1="Oacute" g2="Aring" k="41" /> -<hkern g1="Oacute" g2="Yacute" k="20" /> -<hkern g1="Oacute" g2="quotesinglbase" k="82" /> -<hkern g1="Oacute" g2="quotedblbase" k="82" /> -<hkern g1="Ocircumflex" g2="comma" k="82" /> -<hkern g1="Ocircumflex" g2="period" k="82" /> -<hkern g1="Ocircumflex" g2="A" k="41" /> -<hkern g1="Ocircumflex" g2="T" k="61" /> -<hkern g1="Ocircumflex" g2="V" k="20" /> -<hkern g1="Ocircumflex" g2="W" k="20" /> -<hkern g1="Ocircumflex" g2="X" k="41" /> -<hkern g1="Ocircumflex" g2="Y" k="20" /> -<hkern g1="Ocircumflex" g2="Z" k="20" /> -<hkern g1="Ocircumflex" g2="Agrave" k="41" /> -<hkern g1="Ocircumflex" g2="Aacute" k="41" /> -<hkern g1="Ocircumflex" g2="Acircumflex" k="41" /> -<hkern g1="Ocircumflex" g2="Atilde" k="41" /> -<hkern g1="Ocircumflex" g2="Adieresis" k="41" /> -<hkern g1="Ocircumflex" g2="Aring" k="41" /> -<hkern g1="Ocircumflex" g2="Yacute" k="20" /> -<hkern g1="Ocircumflex" g2="quotesinglbase" k="82" /> -<hkern g1="Ocircumflex" g2="quotedblbase" k="82" /> -<hkern g1="Otilde" g2="comma" k="82" /> -<hkern g1="Otilde" g2="period" k="82" /> -<hkern g1="Otilde" g2="A" k="41" /> -<hkern g1="Otilde" g2="T" k="61" /> -<hkern g1="Otilde" g2="V" k="20" /> -<hkern g1="Otilde" g2="W" k="20" /> -<hkern g1="Otilde" g2="X" k="41" /> -<hkern g1="Otilde" g2="Y" k="20" /> -<hkern g1="Otilde" g2="Z" k="20" /> -<hkern g1="Otilde" g2="Agrave" k="41" /> -<hkern g1="Otilde" g2="Aacute" k="41" /> -<hkern g1="Otilde" g2="Acircumflex" k="41" /> -<hkern g1="Otilde" g2="Atilde" k="41" /> -<hkern g1="Otilde" g2="Adieresis" k="41" /> -<hkern g1="Otilde" g2="Aring" k="41" /> -<hkern g1="Otilde" g2="Yacute" k="20" /> -<hkern g1="Otilde" g2="quotesinglbase" k="82" /> -<hkern g1="Otilde" g2="quotedblbase" k="82" /> -<hkern g1="Odieresis" g2="comma" k="82" /> -<hkern g1="Odieresis" g2="period" k="82" /> -<hkern g1="Odieresis" g2="A" k="41" /> -<hkern g1="Odieresis" g2="T" k="61" /> -<hkern g1="Odieresis" g2="V" k="20" /> -<hkern g1="Odieresis" g2="W" k="20" /> -<hkern g1="Odieresis" g2="X" k="41" /> -<hkern g1="Odieresis" g2="Y" k="20" /> -<hkern g1="Odieresis" g2="Z" k="20" /> -<hkern g1="Odieresis" g2="Agrave" k="41" /> -<hkern g1="Odieresis" g2="Aacute" k="41" /> -<hkern g1="Odieresis" g2="Acircumflex" k="41" /> -<hkern g1="Odieresis" g2="Atilde" k="41" /> -<hkern g1="Odieresis" g2="Adieresis" k="41" /> -<hkern g1="Odieresis" g2="Aring" k="41" /> -<hkern g1="Odieresis" g2="Yacute" k="20" /> -<hkern g1="Odieresis" g2="quotesinglbase" k="82" /> -<hkern g1="Odieresis" g2="quotedblbase" k="82" /> -<hkern g1="Oslash" g2="comma" k="82" /> -<hkern g1="Oslash" g2="period" k="82" /> -<hkern g1="Oslash" g2="A" k="41" /> -<hkern g1="Oslash" g2="T" k="61" /> -<hkern g1="Oslash" g2="V" k="20" /> -<hkern g1="Oslash" g2="W" k="20" /> -<hkern g1="Oslash" g2="X" k="41" /> -<hkern g1="Oslash" g2="Y" k="20" /> -<hkern g1="Oslash" g2="Z" k="20" /> -<hkern g1="Oslash" g2="Agrave" k="41" /> -<hkern g1="Oslash" g2="Aacute" k="41" /> -<hkern g1="Oslash" g2="Acircumflex" k="41" /> -<hkern g1="Oslash" g2="Atilde" k="41" /> -<hkern g1="Oslash" g2="Adieresis" k="41" /> -<hkern g1="Oslash" g2="Aring" k="41" /> -<hkern g1="Oslash" g2="Yacute" k="20" /> -<hkern g1="Oslash" g2="quotesinglbase" k="82" /> -<hkern g1="Oslash" g2="quotedblbase" k="82" /> -<hkern g1="Ugrave" g2="comma" k="41" /> -<hkern g1="Ugrave" g2="period" k="41" /> -<hkern g1="Ugrave" g2="A" k="20" /> -<hkern g1="Ugrave" g2="Agrave" k="20" /> -<hkern g1="Ugrave" g2="Aacute" k="20" /> -<hkern g1="Ugrave" g2="Acircumflex" k="20" /> -<hkern g1="Ugrave" g2="Atilde" k="20" /> -<hkern g1="Ugrave" g2="Adieresis" k="20" /> -<hkern g1="Ugrave" g2="Aring" k="20" /> -<hkern g1="Ugrave" g2="quotesinglbase" k="41" /> -<hkern g1="Ugrave" g2="quotedblbase" k="41" /> -<hkern g1="Uacute" g2="comma" k="41" /> -<hkern g1="Uacute" g2="period" k="41" /> -<hkern g1="Uacute" g2="A" k="20" /> -<hkern g1="Uacute" g2="Agrave" k="20" /> -<hkern g1="Uacute" g2="Aacute" k="20" /> -<hkern g1="Uacute" g2="Acircumflex" k="20" /> -<hkern g1="Uacute" g2="Atilde" k="20" /> -<hkern g1="Uacute" g2="Adieresis" k="20" /> -<hkern g1="Uacute" g2="Aring" k="20" /> -<hkern g1="Uacute" g2="quotesinglbase" k="41" /> -<hkern g1="Uacute" g2="quotedblbase" k="41" /> -<hkern g1="Ucircumflex" g2="comma" k="41" /> -<hkern g1="Ucircumflex" g2="period" k="41" /> -<hkern g1="Ucircumflex" g2="A" k="20" /> -<hkern g1="Ucircumflex" g2="Agrave" k="20" /> -<hkern g1="Ucircumflex" g2="Aacute" k="20" /> -<hkern g1="Ucircumflex" g2="Acircumflex" k="20" /> -<hkern g1="Ucircumflex" g2="Atilde" k="20" /> -<hkern g1="Ucircumflex" g2="Adieresis" k="20" /> -<hkern g1="Ucircumflex" g2="Aring" k="20" /> -<hkern g1="Ucircumflex" g2="quotesinglbase" k="41" /> -<hkern g1="Ucircumflex" g2="quotedblbase" k="41" /> -<hkern g1="Udieresis" g2="comma" k="41" /> -<hkern g1="Udieresis" g2="period" k="41" /> -<hkern g1="Udieresis" g2="A" k="20" /> -<hkern g1="Udieresis" g2="Agrave" k="20" /> -<hkern g1="Udieresis" g2="Aacute" k="20" /> -<hkern g1="Udieresis" g2="Acircumflex" k="20" /> -<hkern g1="Udieresis" g2="Atilde" k="20" /> -<hkern g1="Udieresis" g2="Adieresis" k="20" /> -<hkern g1="Udieresis" g2="Aring" k="20" /> -<hkern g1="Udieresis" g2="quotesinglbase" k="41" /> -<hkern g1="Udieresis" g2="quotedblbase" k="41" /> -<hkern g1="Yacute" g2="comma" k="123" /> -<hkern g1="Yacute" g2="period" k="123" /> -<hkern g1="Yacute" g2="question" k="-41" /> -<hkern g1="Yacute" g2="A" k="123" /> -<hkern g1="Yacute" g2="C" k="41" /> -<hkern g1="Yacute" g2="G" k="41" /> -<hkern g1="Yacute" g2="O" k="41" /> -<hkern g1="Yacute" g2="Q" k="41" /> -<hkern g1="Yacute" g2="a" k="102" /> -<hkern g1="Yacute" g2="c" k="102" /> -<hkern g1="Yacute" g2="d" k="102" /> -<hkern g1="Yacute" g2="e" k="102" /> -<hkern g1="Yacute" g2="g" k="41" /> -<hkern g1="Yacute" g2="m" k="61" /> -<hkern g1="Yacute" g2="n" k="61" /> -<hkern g1="Yacute" g2="o" k="102" /> -<hkern g1="Yacute" g2="p" k="61" /> -<hkern g1="Yacute" g2="q" k="102" /> -<hkern g1="Yacute" g2="r" k="61" /> -<hkern g1="Yacute" g2="s" k="82" /> -<hkern g1="Yacute" g2="u" k="61" /> -<hkern g1="Yacute" g2="z" k="41" /> -<hkern g1="Yacute" g2="Agrave" k="123" /> -<hkern g1="Yacute" g2="Aacute" k="123" /> -<hkern g1="Yacute" g2="Acircumflex" k="123" /> -<hkern g1="Yacute" g2="Atilde" k="123" /> -<hkern g1="Yacute" g2="Adieresis" k="123" /> -<hkern g1="Yacute" g2="Aring" k="123" /> -<hkern g1="Yacute" g2="Ccedilla" k="41" /> -<hkern g1="Yacute" g2="Ograve" k="41" /> -<hkern g1="Yacute" g2="Oacute" k="41" /> -<hkern g1="Yacute" g2="Ocircumflex" k="41" /> -<hkern g1="Yacute" g2="Otilde" k="41" /> -<hkern g1="Yacute" g2="Odieresis" k="41" /> -<hkern g1="Yacute" g2="Oslash" k="41" /> -<hkern g1="Yacute" g2="agrave" k="102" /> -<hkern g1="Yacute" g2="aacute" k="102" /> -<hkern g1="Yacute" g2="acircumflex" k="102" /> -<hkern g1="Yacute" g2="atilde" k="102" /> -<hkern g1="Yacute" g2="adieresis" k="102" /> -<hkern g1="Yacute" g2="aring" k="102" /> -<hkern g1="Yacute" g2="ae" k="102" /> -<hkern g1="Yacute" g2="ccedilla" k="102" /> -<hkern g1="Yacute" g2="egrave" k="102" /> -<hkern g1="Yacute" g2="eacute" k="102" /> -<hkern g1="Yacute" g2="ecircumflex" k="102" /> -<hkern g1="Yacute" g2="edieresis" k="102" /> -<hkern g1="Yacute" g2="ograve" k="102" /> -<hkern g1="Yacute" g2="oacute" k="102" /> -<hkern g1="Yacute" g2="ocircumflex" k="102" /> -<hkern g1="Yacute" g2="otilde" k="102" /> -<hkern g1="Yacute" g2="odieresis" k="102" /> -<hkern g1="Yacute" g2="oslash" k="102" /> -<hkern g1="Yacute" g2="ugrave" k="61" /> -<hkern g1="Yacute" g2="uacute" k="61" /> -<hkern g1="Yacute" g2="ucircumflex" k="61" /> -<hkern g1="Yacute" g2="udieresis" k="61" /> -<hkern g1="Yacute" g2="OE" k="41" /> -<hkern g1="Yacute" g2="oe" k="102" /> -<hkern g1="Yacute" g2="quotesinglbase" k="123" /> -<hkern g1="Yacute" g2="quotedblbase" k="123" /> -<hkern g1="Thorn" g2="comma" k="266" /> -<hkern g1="Thorn" g2="period" k="266" /> -<hkern g1="Thorn" g2="A" k="102" /> -<hkern g1="Thorn" g2="X" k="41" /> -<hkern g1="Thorn" g2="Z" k="20" /> -<hkern g1="Thorn" g2="Agrave" k="102" /> -<hkern g1="Thorn" g2="Aacute" k="102" /> -<hkern g1="Thorn" g2="Acircumflex" k="102" /> -<hkern g1="Thorn" g2="Atilde" k="102" /> -<hkern g1="Thorn" g2="Adieresis" k="102" /> -<hkern g1="Thorn" g2="Aring" k="102" /> -<hkern g1="Thorn" g2="quotesinglbase" k="266" /> -<hkern g1="Thorn" g2="quotedblbase" k="266" /> -<hkern g1="agrave" g2="quotedbl" k="20" /> -<hkern g1="agrave" g2="quotesingle" k="20" /> -<hkern g1="agrave" g2="quoteright" k="20" /> -<hkern g1="agrave" g2="quotedblright" k="20" /> -<hkern g1="aacute" g2="quotedbl" k="20" /> -<hkern g1="aacute" g2="quotesingle" k="20" /> -<hkern g1="aacute" g2="quoteright" k="20" /> -<hkern g1="aacute" g2="quotedblright" k="20" /> -<hkern g1="acircumflex" g2="quotedbl" k="20" /> -<hkern g1="acircumflex" g2="quotesingle" k="20" /> -<hkern g1="acircumflex" g2="quoteright" k="20" /> -<hkern g1="acircumflex" g2="quotedblright" k="20" /> -<hkern g1="atilde" g2="quotedbl" k="20" /> -<hkern g1="atilde" g2="quotesingle" k="20" /> -<hkern g1="atilde" g2="quoteright" k="20" /> -<hkern g1="atilde" g2="quotedblright" k="20" /> -<hkern g1="adieresis" g2="quotedbl" k="20" /> -<hkern g1="adieresis" g2="quotesingle" k="20" /> -<hkern g1="adieresis" g2="quoteright" k="20" /> -<hkern g1="adieresis" g2="quotedblright" k="20" /> -<hkern g1="aring" g2="quotedbl" k="20" /> -<hkern g1="aring" g2="quotesingle" k="20" /> -<hkern g1="aring" g2="quoteright" k="20" /> -<hkern g1="aring" g2="quotedblright" k="20" /> -<hkern g1="egrave" g2="quotedbl" k="20" /> -<hkern g1="egrave" g2="quotesingle" k="20" /> -<hkern g1="egrave" g2="v" k="41" /> -<hkern g1="egrave" g2="w" k="41" /> -<hkern g1="egrave" g2="x" k="41" /> -<hkern g1="egrave" g2="y" k="41" /> -<hkern g1="egrave" g2="z" k="20" /> -<hkern g1="egrave" g2="yacute" k="41" /> -<hkern g1="egrave" g2="quoteright" k="20" /> -<hkern g1="egrave" g2="quotedblright" k="20" /> -<hkern g1="eacute" g2="quotedbl" k="20" /> -<hkern g1="eacute" g2="quotesingle" k="20" /> -<hkern g1="eacute" g2="v" k="41" /> -<hkern g1="eacute" g2="w" k="41" /> -<hkern g1="eacute" g2="x" k="41" /> -<hkern g1="eacute" g2="y" k="41" /> -<hkern g1="eacute" g2="z" k="20" /> -<hkern g1="eacute" g2="yacute" k="41" /> -<hkern g1="eacute" g2="quoteright" k="20" /> -<hkern g1="eacute" g2="quotedblright" k="20" /> -<hkern g1="ecircumflex" g2="quotedbl" k="20" /> -<hkern g1="ecircumflex" g2="quotesingle" k="20" /> -<hkern g1="ecircumflex" g2="v" k="41" /> -<hkern g1="ecircumflex" g2="w" k="41" /> -<hkern g1="ecircumflex" g2="x" k="41" /> -<hkern g1="ecircumflex" g2="y" k="41" /> -<hkern g1="ecircumflex" g2="z" k="20" /> -<hkern g1="ecircumflex" g2="yacute" k="41" /> -<hkern g1="ecircumflex" g2="quoteright" k="20" /> -<hkern g1="ecircumflex" g2="quotedblright" k="20" /> -<hkern g1="edieresis" g2="quotedbl" k="20" /> -<hkern g1="edieresis" g2="quotesingle" k="20" /> -<hkern g1="edieresis" g2="v" k="41" /> -<hkern g1="edieresis" g2="w" k="41" /> -<hkern g1="edieresis" g2="x" k="41" /> -<hkern g1="edieresis" g2="y" k="41" /> -<hkern g1="edieresis" g2="z" k="20" /> -<hkern g1="edieresis" g2="yacute" k="41" /> -<hkern g1="edieresis" g2="quoteright" k="20" /> -<hkern g1="edieresis" g2="quotedblright" k="20" /> -<hkern g1="eth" g2="quotedbl" k="20" /> -<hkern g1="eth" g2="quotesingle" k="20" /> -<hkern g1="eth" g2="v" k="41" /> -<hkern g1="eth" g2="w" k="41" /> -<hkern g1="eth" g2="x" k="41" /> -<hkern g1="eth" g2="y" k="41" /> -<hkern g1="eth" g2="z" k="20" /> -<hkern g1="eth" g2="yacute" k="41" /> -<hkern g1="eth" g2="quoteright" k="20" /> -<hkern g1="eth" g2="quotedblright" k="20" /> -<hkern g1="ograve" g2="quotedbl" k="20" /> -<hkern g1="ograve" g2="quotesingle" k="20" /> -<hkern g1="ograve" g2="v" k="41" /> -<hkern g1="ograve" g2="w" k="41" /> -<hkern g1="ograve" g2="x" k="41" /> -<hkern g1="ograve" g2="y" k="41" /> -<hkern g1="ograve" g2="z" k="20" /> -<hkern g1="ograve" g2="yacute" k="41" /> -<hkern g1="ograve" g2="quoteright" k="20" /> -<hkern g1="ograve" g2="quotedblright" k="20" /> -<hkern g1="oacute" g2="quotedbl" k="20" /> -<hkern g1="oacute" g2="quotesingle" k="20" /> -<hkern g1="oacute" g2="v" k="41" /> -<hkern g1="oacute" g2="w" k="41" /> -<hkern g1="oacute" g2="x" k="41" /> -<hkern g1="oacute" g2="y" k="41" /> -<hkern g1="oacute" g2="z" k="20" /> -<hkern g1="oacute" g2="yacute" k="41" /> -<hkern g1="oacute" g2="quoteright" k="20" /> -<hkern g1="oacute" g2="quotedblright" k="20" /> -<hkern g1="ocircumflex" g2="quotedbl" k="20" /> -<hkern g1="ocircumflex" g2="quotesingle" k="20" /> -<hkern g1="ocircumflex" g2="v" k="41" /> -<hkern g1="ocircumflex" g2="w" k="41" /> -<hkern g1="ocircumflex" g2="x" k="41" /> -<hkern g1="ocircumflex" g2="y" k="41" /> -<hkern g1="ocircumflex" g2="z" k="20" /> -<hkern g1="ocircumflex" g2="yacute" k="41" /> -<hkern g1="ocircumflex" g2="quoteright" k="20" /> -<hkern g1="ocircumflex" g2="quotedblright" k="20" /> -<hkern g1="odieresis" g2="quotedbl" k="41" /> -<hkern g1="odieresis" g2="quotesingle" k="41" /> -<hkern g1="odieresis" g2="quoteright" k="41" /> -<hkern g1="odieresis" g2="quotedblright" k="41" /> -<hkern g1="oslash" g2="quotedbl" k="20" /> -<hkern g1="oslash" g2="quotesingle" k="20" /> -<hkern g1="oslash" g2="v" k="41" /> -<hkern g1="oslash" g2="w" k="41" /> -<hkern g1="oslash" g2="x" k="41" /> -<hkern g1="oslash" g2="y" k="41" /> -<hkern g1="oslash" g2="z" k="20" /> -<hkern g1="oslash" g2="yacute" k="41" /> -<hkern g1="oslash" g2="quoteright" k="20" /> -<hkern g1="oslash" g2="quotedblright" k="20" /> -<hkern g1="yacute" g2="quotedbl" k="-82" /> -<hkern g1="yacute" g2="quotesingle" k="-82" /> -<hkern g1="yacute" g2="comma" k="82" /> -<hkern g1="yacute" g2="period" k="82" /> -<hkern g1="yacute" g2="question" k="-41" /> -<hkern g1="yacute" g2="quoteright" k="-82" /> -<hkern g1="yacute" g2="quotesinglbase" k="82" /> -<hkern g1="yacute" g2="quotedblright" k="-82" /> -<hkern g1="yacute" g2="quotedblbase" k="82" /> -<hkern g1="thorn" g2="quotedbl" k="20" /> -<hkern g1="thorn" g2="quotesingle" k="20" /> -<hkern g1="thorn" g2="v" k="41" /> -<hkern g1="thorn" g2="w" k="41" /> -<hkern g1="thorn" g2="x" k="41" /> -<hkern g1="thorn" g2="y" k="41" /> -<hkern g1="thorn" g2="z" k="20" /> -<hkern g1="thorn" g2="yacute" k="41" /> -<hkern g1="thorn" g2="quoteright" k="20" /> -<hkern g1="thorn" g2="quotedblright" k="20" /> -<hkern g1="ydieresis" g2="quotedbl" k="-82" /> -<hkern g1="ydieresis" g2="quotesingle" k="-82" /> -<hkern g1="ydieresis" g2="comma" k="82" /> -<hkern g1="ydieresis" g2="period" k="82" /> -<hkern g1="ydieresis" g2="question" k="-41" /> -<hkern g1="ydieresis" g2="quoteright" k="-82" /> -<hkern g1="ydieresis" g2="quotesinglbase" k="82" /> -<hkern g1="ydieresis" g2="quotedblright" k="-82" /> -<hkern g1="ydieresis" g2="quotedblbase" k="82" /> -<hkern g1="OE" g2="J" k="-123" /> -</font> -</defs> -</svg> diff --git a/static/fonts/opensans-e3fd16403f24a08113a25694375f81f33c5a258c.woff2 b/static/fonts/opensans-e3fd16403f24a08113a25694375f81f33c5a258c.woff2 Binary files differdeleted file mode 100755 index a384113..0000000 --- a/static/fonts/opensans-e3fd16403f24a08113a25694375f81f33c5a258c.woff2 +++ /dev/null diff --git a/static/fonts/opensans-e78854b43389426899362d164d53fbf48274b93a.woff2 b/static/fonts/opensans-e78854b43389426899362d164d53fbf48274b93a.woff2 Binary files differdeleted file mode 100755 index f6a8ce6..0000000 --- a/static/fonts/opensans-e78854b43389426899362d164d53fbf48274b93a.woff2 +++ /dev/null diff --git a/static/fonts/opensans-e839476c7410d2f694c65d3944604ad28914ca2f.woff2 b/static/fonts/opensans-e839476c7410d2f694c65d3944604ad28914ca2f.woff2 Binary files differdeleted file mode 100755 index ded7002..0000000 --- a/static/fonts/opensans-e839476c7410d2f694c65d3944604ad28914ca2f.woff2 +++ /dev/null diff --git a/static/fonts/opensans-e9d0949ee599c94d4f310e35793abe016cb7e86b.ttf b/static/fonts/opensans-e9d0949ee599c94d4f310e35793abe016cb7e86b.ttf Binary files differdeleted file mode 100755 index 81fd77e..0000000 --- a/static/fonts/opensans-e9d0949ee599c94d4f310e35793abe016cb7e86b.ttf +++ /dev/null diff --git a/static/fonts/opensans-ebd05b36b3d9ee7ed2cbcee6cdf5796ce05d839c.woff2 b/static/fonts/opensans-ebd05b36b3d9ee7ed2cbcee6cdf5796ce05d839c.woff2 Binary files differdeleted file mode 100755 index 511512c..0000000 --- a/static/fonts/opensans-ebd05b36b3d9ee7ed2cbcee6cdf5796ce05d839c.woff2 +++ /dev/null diff --git a/static/fonts/opensans-ec2590bc030c185025fbc09afe2f268af6e38985.woff2 b/static/fonts/opensans-ec2590bc030c185025fbc09afe2f268af6e38985.woff2 Binary files differdeleted file mode 100755 index bf65567..0000000 --- a/static/fonts/opensans-ec2590bc030c185025fbc09afe2f268af6e38985.woff2 +++ /dev/null diff --git a/static/fonts/opensans-ee96f92c030d0e35d631a16c507a7a269e9594b5.ttf b/static/fonts/opensans-ee96f92c030d0e35d631a16c507a7a269e9594b5.ttf Binary files differdeleted file mode 100755 index fd7156a..0000000 --- a/static/fonts/opensans-ee96f92c030d0e35d631a16c507a7a269e9594b5.ttf +++ /dev/null diff --git a/static/fonts/opensans-f06dff19fbba12718cd431381a1dd1202bd13763.woff2 b/static/fonts/opensans-f06dff19fbba12718cd431381a1dd1202bd13763.woff2 Binary files differdeleted file mode 100755 index 0ebb279..0000000 --- a/static/fonts/opensans-f06dff19fbba12718cd431381a1dd1202bd13763.woff2 +++ /dev/null diff --git a/teaching/encryption/01-encryption-101-basics.md b/teaching/encryption/01-encryption-101-basics.md new file mode 100755 index 0000000..082016c --- /dev/null +++ b/teaching/encryption/01-encryption-101-basics.md @@ -0,0 +1,70 @@ +Title: 01. Encryption 101: Basics +Date: 2013-07-26 20:31 +Category: Data Privacy +Tags: Guides +Slug: 01-encryption-101-basics +Status: published + +If you haven't lived under a rock for the past few weeks you'll have +heard about the NSA and PRISM essentially spying spying on the entire +world. Now, I will write an article about why this is actually upsetting +and there are good reasons to protect ones privacy even if you have +"nothing to hide". In this tutorial I want to show you that encrypting +your communications and computers is a good way to protect yourself but +hardly the only thing you can do. And even if you encrypt everything in +your life you will leave behind a lot of meta data on the internet. +Enough to reconstruct what you were doing, what you think, who you would +vote for etc. + +In this series I want to show you a little bit how you can protect +yourself. However, in this first post I want to explain you the basics +of cryptography. I won't go into detail about mathematical constructs, +you can read that on Wikipedia. But as an average person you won't need +that. Let's begin. + +There are different ways how to encrypt things. The two big ways I want +to talk about now is **symmetric** and **asymmetric** encryption. + +Let's look at symmetric encryption first: + + + +In symmetric encryption the user creates a key. That key is then being +used to encrypt but also decrypt a file. This makes the process of +encryption and decryption very fast, however also creates the problem +that the key needs to be transferred safely. If somebody got hold of the +key they could encrypt and decrypt files that they might not be able to. +Symmetric encryption is great for hard drive and large chunks of data. + +However this isn't very practical in communication with others. You want +others to be able to encrypt messages sending to you but be the only one +that can decrypt them again. This is the basic idea of asymmetric +encryption. The following schematic will explain. + + + +There is a pair of keys: one public, one private. The public key is +being used to encrypt a file. In practise this is the key that you send +out to other people. They encrypt the messages they send to you and then +send them to you. +The private key is the one you keep to yourself (private) and under no +circumstances send to any computer or device. Only transport it on +offline drives like USB sticks, SD cards or external hard drives. This +is the key that will allow you to decrypt messages sent to you. + +If you use asymmetric encryption in your communication you can encrypt +messages for others with their public keys and decrypt messages others +sent you with your private key. + + + +In following tutorials I will quickly show you how to encrypt messages +using PGP on Mac OS X, Windows and Linux, how to encrypt your hard drive +on Mac and Windows and also how to use encrypted instant messaging +services. After that I will show you ways to stay anonymous on the +internet and leave behind fewer clues about who you are and what you +were doing. Even if you have nothing to hide that doesn't mean that you +need to invite everybody into your private life! + +P.S. This tutorial series was inspired by my brothers short descriptions +about security [here](http://www.leandersabel.de/itsecurity/). diff --git a/teaching/encryption/02-encryption-101-pgp-on-mac.md b/teaching/encryption/02-encryption-101-pgp-on-mac.md new file mode 100755 index 0000000..a189244 --- /dev/null +++ b/teaching/encryption/02-encryption-101-pgp-on-mac.md @@ -0,0 +1,366 @@ +Title: 02. Encryption 101: PGP on Mac +Date: 2013-10-16 16:26 +Category: Data Privacy +Tags: Guides +Slug: 02-encryption-101-pgp-on-mac +Status: published + +Hello Internet, + +I started this series about encryption a few weeks ago but then kinda +ran out of time to actually do something with it so now I want to +continue it. Essentially this is about PGP and email encryption. This +tutorial is being inspired by my brothers (much shorter) article about +the whole thing: +<http://www.leandersabel.de/itsecurity/e-mail-encryption/>) + +What is PGP, you might ask? Well, it's a good question. PGP stands for +Pretty Good Privacy and uses an asymmetrical encryption concept that you +should have learned about in the [last blog +post](http://www.spacekookie.de/01-encryption-101-basics/ "01. Encryption 101: Basics")in +this series. If you haven't...shame on you! + +I want to focus on installing this email encryption on Mac Computers +first. This is compatible for several versions back. + +The asymetric email encryption is based on a zero knowlege principle: +you send data through the web and except for the recipient of that data +NOBODY will be able to know what it is. Due to that the encryption needs +to happen on your device (in this case a Mac computer) and be decrypted +on an end device again (for example a Windows computer). + +It doesn't really matter what e-mail provider you use as you will be +downloading the mails anyways. The easiest way to do that on a Mac is +with the pre-installed *Mail* program. If you haven't already get your +Mail to download mail from your account. If you've done this already you +can skip ahead to **[Encrypting your Mail](#encryption).** + +**Setting up Mail with your account** {style="text-align: justify;"} +------------------------------------- + +Open Mail and click on Mail --\> Preferences + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/mailpgp1.png) + +In the upcoming window click on Accounts and then select the "+" sign on +the bottom +[](http://www.spacekookie.de/wp-content/uploads/2013/10/mailpgp2_1.png)Another +window will pop up where you need to enter the apropriate information. +For large e-mail providers like gmail, yahoo, hotmail, etc. this is +quite trivial. If you are using a different webhoster you might have to +**check their FAQs for server information!** + +**[](http://www.spacekookie.de/wp-content/uploads/2013/10/mailpgp3.png)**After +this is done you should be able to download the e-mails from your +account to your computer. You may start a celebratory dance now! + +Next up: + +<a name="encryption"></a> + +**Encrypting your Mail +** {style="text-align: justify;"} +----------------------- + +Now that your emails are being downloaded to your computer we can set +you up with the encryption software. The one that is the easiest to use +is called GPG, standing for *GNU Privacy Guard* (with GNU being a linux +distribution). The software comes in an easy to install package that can +be found at: [https://gpgtools.org](https://gpgtools.org/) Just scroll +down to the download button and download the suite to your computer. +Double click the .dmg file you downloaded and wait for the following +window to pop up: + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/gpginstall1.png) + +This should be trivial but double click install :) Another window will +come up. Be sure to select the right harddrive. It should be installed +on the harddrive that also contains your operating system. In my case +the Harddrive is called *TARDIS* (It's bigger on the inside). + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/gpginstall2.png) + +When the installation is complete eject the installation drive by +dragging it onto the trash. It's not needed anymore. Open GPG (by either +searching for it in your Applications folder or using spotlight in the +top right corner) + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/gpginstall3.png) + +When you open GPG for the first time it will look somewhat like this for +you: (Except you won't have any keys in it). + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/gpfinstall4.png) + +Enter your name, your email adress and check the "Upload public key +after generation" to make it easier for people to be able to find your +key. This means that they will be able to send you e-mails encrypted. If +you don't want that, don't tick it. I recomend it for regular users +because it makes exchanging keys easier. Press **Generate key** +to…generate the key (duh). During the generation process move your mouse +as much as possible and even type random letters on your keyboard. + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/Screen-Shot-2013-10-16-at-17.40.57.png)When +a window comes up and promts you to enter a password do that so. +**Choose a strong password as it will be the foundation of your e-mail +encryption**. The longer and more complicated, the better. The +application will then take your passphrase and the random input from +mouse and keyboard to generate a pair of keys: one private, one public. + +If you checked it accordingly the public key will be uploaded to the MGU +servers for other people to find. The public key is used to encrypt +emails. Other people that have your public key can thus send you a +message that is encrypted. To decrypt the messages you need your private +key **that should under no circumstances be sent via the internet or any +network!** + +If you need to move your private key to a second computer for use do so +on a USB drive or local, external harddrive. **DO NOT STORE YOUR PRIVATE +KEY IN A CLOUD SERVICE** + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/gpginstall6.png) + +The "sec" indicates that there is a secure (private) key. The "pub" +stands for a public key. The two combined make a key pair which you +should only have one of. So far you should be set to communicate so +let's move onto the next topic: + + {style="text-align: justify;"} + +**Sending encrypted Mail** {style="text-align: justify;"} +-------------------------- + +Now that this is all set up, what can you do with this? First of all, +this encryption only works if the other person you're communicating with +is also using a PGP system (no matter what implimentation or operating +system). + +First of all be sure to restart your Mail application after you +installed GPG. Otherwise the plugin won't start. Go ahead and compose a +new email. This is what it should look like now: + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/mailtest1.png) + +The green space on the top right indicates that OpenPGP is active with +the selected email adress. The little tick in the middle confirmes that +a signature will be attached to the mail. You can disable to sign your +emails by clicking on the tick. + +If you then enter an email adress of somebody that you own the public +key from (in my case let me write a mail to my brother Leander) things +will change a bit: + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/mailtest2.png) + +The lock icon will become active and you will be able to lock it. The +lock indicates that the email will be encrypted. As the picture also +indicates the subject of a message is not being encrypted, **only the +content (including attachments).** Oh and please note that sending +attachments of multiple gigabytes might take a while to encrypt :) + +If I send this message now, let's see what it looks like for the NSA: + +``` {.lang:default .decode:true} +-----BEGIN PGP MESSAGE----- +Comment: GPGTools - http://gpgtools.org + +hQIMA9/TMwACUeWZARAAoDigWvXjH8xzx4WdBUbs3aZPpJvpVoIsCVe594j9rfJu +ATQUvHF7qLUYazr2+aP+eHInuhjhgZSFyFemcmnvHI/H2XrucPp1jNhdCH8vLWo9 +xvftXRXE0s6jzuaB9qSLRqQ1lHPfpdXkHz05qplP4PBDIpVBMolN9vmQWpg+/ZyW +AI8Ji/GNaT6GfCEV2h/ZXKGtRqwipWy8Wd4n+tiH4MnUaWDlFSxeUdn2LNVXTfyY +vrbaeAvfFCSwI40JVbP1E5eevD1bVgXFQ8aFsBS1GpjCY/DbmegE/qRuWmYymVim +l+vzL3Fw3cKkMVUurf6I/Hgh/hXo/sJh2fgdXaabE6NrkQanHPMxjL6/UiTL9a1D +lYEBl+TGPo6UmQhUH0G5kmPezop9Isu6Ql6xZq0SfaSR4p8QXUH8/SaE4lmiUL2O +CgEn3CFncXcpCniO+2SX/f+JAPBb7SJRbKC1E81UzNwll0tOfKTflaylyWTC18Lo +La/eMXBy/U6s91ZtfTImLdSGZI2ZffrVCmnGcK6DpLAbJCWUbsdRtmJyATDj5X1+ +8jaCJU5Hhd2LybqXCtabMBXncbBSc10dAbptmVbIoNt3RAUSnUtjo62e6CPnxIIW ++GTGuD4NYReAB9JLRiuKYH5kJG0rwaokXRg9J1m2aH2r2zjyGB3zV5cJ+cI/rDOF +AQwD1U6FkjYiVDQBB/42b2VMDl8jcnOhcdWYRy+HCBw20fEKY1wOaqfLr0Rz34+A +bW3JfRjixTjteF6R+lU+XVcKeEoP7P7XDPFKsjOhx8sdICvc9nRc9KNDQKWULZaF +W+9dMhZma1WFasQLqgCLnFbron9LpQ3n5DuJ59jCk8EVgCX3WPClN9MnCMzZghOY +kphb68WKSswDJBQZsE0iw3r3mhj6jfOkyzH3/gGhle3N0BsNqVNaDsKEdHV8LN+s +qDBAMBRjEuPViXA+OVYzxfRAaEhAAPJVySKQAp+rwQt+BG0lVgO/1qzQn748UEEK +9/ZwZz4HHiKAqIHcazZGWF6amc7oFHUfJSlnWLMt0ukByKhRAf1K45TMwnJlzxmO +0jhU2DefcGfuR27i+6FbimhWeUFtbkBUdFa2ZKyTBQDGKABqi4XKW2ObCF+bHBkl +PKYEhTmcvf9Y0ejnPRb77Kng79fRlvTjpuEmMHk/rIcVL8WICO9LamxgFCMWVxU/ +olHJNNVDPr9mjmlbKmAc6YTZ0POx9+mq09VIhmzoWqj9V+QcgDX+7XZO1qANdjnt +2bA2jn7neg8VTaROiWBKEuZCFB1FnzoO6yiLYsTBzzmHxiAD0pJuSnCk0EDQzIHy +b1e5yzMWnfQKeiWQkDEvFtaLzBA/f7VGVet9INnIfhDQogT+DTPn2EEe6CUYiOem +rlribmNx8uVzTSoiGrmLnEPRF1Cic+M3gRXj7835R/VMlYUo4Ii3uiZ6iIx4OlPF +4cP18BpA/GM0EIk1GjVV91oqtV9T5wL8fH8bdWdPJMpuKE11rPNJADLUD2G7KqLW +ezYDY5qqqvrMWregEApyo9fUevu1mO2QyphtsIbmeBd7WCExY5Xmnr8haHDdONVR +CBTUwDgCBHOa+iJynx7jbrVL24R36uMrqMCxV3xWtZl3afUYWtIhdQh/7s/c4r0w +9s6Qu3Z6Xy6Upyjx+FVk3PMeoA6hEHlMYUb6fCnMMH3c5Qiymu9fZU7X/WA9RCaT +DGppgD2l16PMJmBIen9uZcAsu7gOg+HSVEAPLduT09AHNzLBAiQ0VXdE42+PT38+ +hLaVuaBgKzRMNGU/qHvo30R7on0YJsaDFusmtqgW3Rpgv+W/VIMN3FD33r28irnl +jFS0JOw6OQAmxBabBacjKl0jnlItbxAPgkBiVQTgdIDAhH1MvnfJwGGyppI87cXf +0aLjtxwLHzXKSeEJSjJl08+EUAfSyXItxLoyGWpxgJV/TMU6iRGYlzrSszZ0SbJ9 +AWYtOlUmQuNmP9JqgCnjiLZOz+q7nQYykmtvnCcWKkAPMxNootieQ9wwL1iAdr/z +qJNMy4CS6/L22o/yiUw= +=hOZe +-----END PGP MESSAGE----- +``` + +Yea...not very much :) The longer your key (and message obviously) the +more and longer jibberish the message will be. And the best thing? It is +mathematically impossible to reverse engineer the message by generating +random keys. Because for each encrypted message there is a key that can +make the original message into any other message. Literally the message +I just sent my brother could be translated into Shakespeares Hamlet with +the right key. + +A little note: What you see above is what you will see in your mail +inbox if you access your mails without the Mail program or GPG +installed. So be sure to follow the tutorial again for any computer you +might use this on. In my opinion this is the best part, as copanies like +Google or Microsoft that store your emails will have no idea what you're +sending things about. + + {style="text-align: justify;"} + +<a name="exporting"></a> + + {style="text-align: justify;"} + +**A few last pointers** {style="text-align: justify;"} +----------------------- + +Right clicking onto your key pair in GPG will get you a context menu +with which you will be able to do a variety of things. Now an +explanation for the most important ones: + +1. Export: saves the key as a text file to a location on your computer. + You can either export your public key or the pair (public and + private). Use this to move your private key to a new computer. +2. Send public key to key server: If you have made changes to your key + or haven't checked the option before you can upload your key to a + public server for people to find you. +3. Update a public key from the keyserver in case you accidentally + deleted it. You can't update your private key. **You loose it, it's + gone!** +4. Show info: displays all kinds of information about the key. You will + be able to add a new e-mail adress to the key, in case you want to + send encrypted emails from multiple adresses or change the + expiration date of the key, etc. + +One last important thing: What if you want to import a key to your GPG +keychain? Take my public key for example: + +``` {.lang:default .decode:true} +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG/MacGPG2 v2.0.19 (Darwin) + +mQENBFHwNKMBCACv+bBqsqSodJVWkGSS2TaIcuXr3hRWy3XEPeSJaE5oHyGWfVTt +TEzV7BeFctw7aS7CjUzUZpzUwjQLKQ1Chp3pCrzFk815SliLICNTIB/5H1vFYkYz +gh5kaYQOTgjE9FV8qO7ZiKS0ZKKdZvcK+I5wUz3jfha4Pb3MCUlybquW9Lt5H3kM +i0n1zwzB5cQTr9dQL/y9V21R+Azm+iAF1FX8z8zeNMRR21o7bKiXomlXWhya+Awk +RmHfEcnx+PJuCEeSEkteYLeglWhrFTo5HCgkIr/lPsYk6Kxtqjg77R31yklS5O/S +h0XRsqgVlJMASueA5iN/r5YecRiUoH+v73nDABEBAAG0MEthdGhhcmluYSBTYWJl +bCA8a2F0aGFyaW5hLnNhYmVsQDJyc29mdHdvcmtzLmRlPokBPgQTAQIAKAUCUfA0 +ywIbLwUJB4YfgAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQXPybTHjRhSYP +1Qf+LAomofNgqIWiotbANMRBjZhvbnE5v+cCln0FSy2bNZcS6m1tsOOx/uVpx5nZ +OWl9hwGSSk4fgPd1Xdf/af7z3wnpjiphV3tmM4gduE0N/vZS+/KvSg2Wppr07mdk +cmOoMVuftFPbruXswJydn2Ep32TGG+xoVuLiDxnj3D+Oy5n79O5xSTCXZBAYZABK +vlo9VtStZhiIrDbgsFQkLUOJTmrj3evMWgSk3yvZ/rbpbaq/pRcV0yf6owg9VIaj +A6P9n19K60xegDM3YdfgTAue7uWEiWbezIBT6QnXLv7F39T+wzg+DpMCM7FMc7Wk +hTUoPFo4sNv2PyVAAi5Asb3RBbQrS2F0aGFyaW5hIFNhYmVsIDxzYWJlbC5rYXRo +YXJpbmFAZ21haWwuY29tPokBPgQTAQIAKAUCUfA0owIbLwUJB4YfgAYLCQgHAwIG +FQgCCQoLBBYCAwECHgECF4AACgkQXPybTHjRhSYZEwf/VOO8QisSKJeGqc1dZ2DO +zdcRvd7szj86iPaDprc0PkZtowcvMRFUF7REwsghJSOL+nZxCgCzV3Dq+qiL3z5h +nV4XKxlbS3FSGXYx0lVeGLRoAoGkOi2PFyblZ2xcmBwr9Vvi/bMs5YqVD0trvLSt +eJFKyAJm88vhPnW/S/glwU2mSxm6K+npCpEuxKfn6m2r7Fo7IoEpUvglP5GaDAGF +6PbzBmkD5UXq75NtEw7GzuuPOJAmcJbgFqrxZwUVtzbt/bvdKB2JlnYNjbsBFYZw ++oXDotC/TYuST2T98+xfEVTiWFveK0uIfv4X51yRKCTfJbJiKekMH65oxxbvX8/6 +KrQsS2F0aGFyaW5hIFNhYmVsIDxrYXRoYXJpbmFzYWJlbEBsYXZhYml0LmNvbT6J +AT4EEwECACgFAlHwNOoCGy8FCQeGH4AGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheA +AAoJEFz8m0x40YUmZ1sH/A8qUBDz5VmogvCyaFHG9ibNxeZuXyH19xdBhfkyFeAc +QUMJJYjjdbq1yw/ErFaVFnTrDl3bolgSGQ5Fb5PeXSEQxDLW/0QK6uHDhwH9ZnjH +HW64+m+ihaDSCjTpCw/1lxkuFTyZTCf9VjE7PhBYIF4wMrDTgPjzHYfcmf0dNPj9 +Z8gIpfLQ54XVY0XmImfeMD0kFVPTgzGXbAd0AX4ZDYkYB/ZbKD4Ksqr1upY8CpYZ +NO/6kR6MKQ+Vn8YgSA3BDFG8kdNXSc2yWua9xwrdevz5rvvPQgwdw86VqlSV2UhC +gzWLmwJb7esv0w6Om1to9JXp0KKm7U7iJ9133LKMUB25AQ0EUfA0owEIALhK9EAg +4OKzm6qmBdUCAJViZuxvvILAfJ2eGf1+sSqYx4Z+n8TUUX/WCE5grDoj7frH5LbK ++Bi6gicWSEMorIj32Av5TOmbZmjOK4l1yanFs/EhzJYfuP3YMQjYOAdEs7CM03vB +SweXq8eDW6mbVbPpgc6GcSsEqgT1VZNUIOuFxe+D1kyJWA69e/tXF4Cv4kwc/9oF +qTYnjRxvwOIkUQDt8I7/Uh0cYqNi8K8GkXrmcW2008iuKX4YMbSuGOqewnrYpFEG +N5LNPGadcRuY9k6D55ZN4uZDCH3KOVQOEMFp8RKMHF/WEuvd7I21PRe2orwUXlz4 +VuncvRZlsdoMl/EAEQEAAYkCRAQYAQIADwUCUfA0owIbLgUJB4YfgAEpCRBc/JtM +eNGFJsBdIAQZAQIABgUCUfA0owAKCRDVToWSNiJUNNt8B/9Nv6X8XSGyabFuw5ia +x+AyZFk+NJ7tumHIPNMMzUBXtL/QtTJUnJnJRNj2O3WTwJpbiWAwPSQEEXZ6MMMx +qxZpaWqjekEOPH0Nho1lqEWXT1YK2fVukCSphlE9G+tj1qn0F+m9c7ATXqINuAAc +4z6ImH7W5FhcWHbvanWx+k9i+MOKXgrlXGc6biAavjX3S10hcbwTKtbyCOPnrl52 +emDxkKCYAn3ufj/Rw1KlrmFRlz0OIdXVET3a9jFDIBvmSUSJMGn9jDvLs+mlop7h +dX+ujNQYLPvdeiLSeAuVy6HKMghmE86Y0XBSVFnkAYjuAESDXHjCJ8XsU6vcVnjo +L5lE504H/RyI3qilS8MmZLuAZoHm7mhIcYBFQ07+VMG2iCNFx4JjgAnbelVXiVkH ++snXGkmDgnhognlh6UzgEs3MJpR3tfHVukHKVY1hLydEKDEU4UmFczoXLi3Ofxmp +g2JMxMl03IbqSMD3ZKGXiwROf0OzVlTw6ACT93LOzwS3xYB438Xdc2cFTiWm7q5P +i0a3BenADw9Jq4Z2QcnG1KIP6f+Z45OfIy2bbqtJ6H0UwvuNrDEmNgoPjQuS6cHJ +o5FQmZdhg7EauPkgcrkaJf6f/IiX8rGYcnDCqVKhwIV2ScAiJpBq54/T6Or+ST/t +kM773MWawwH7Z3VRQLYT/oweYc6Pd1A= +=NBpw +-----END PGP PUBLIC KEY BLOCK----- +``` + +(Downloadable here: +<http://spacekookie.de/pgp/katharina-sabel-public.asc>) + +First open a text editor of your choosing. In my case I will use the +standard Mac **Text Edit.** Now you need to copy and paste the key +(From --BEGIN-- to --END--) and paste it into your text +editor.[](http://www.spacekookie.de/wp-content/uploads/2013/10/importkeymac1.png) + +Looks kinda scary, I know. Hang in there. Now save the file with CMD + +S. In the following popup you need to select to save the file locally +and not on Apples iCloud servers. They can be great but not for this! + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/importkeymac2.png) + +Give the file a random name (it's not really important) and save it. +Next up close the Text Editor and navigate to your saved file. Right +click on it to bring up the context menu and choose **Get Info** + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/importkeymac3.png)In +the upcoming window then search for the name field and change the +extention from .rtf to **.asc** + +.RTF is a file format for text files and great for stuff. But we want +the GPG application to recognize all the jibberish as a key and for that +we need to change the extention to .asc + +When your computer prompts you if you're sure you agree and change the +extention to **.ASC** + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/importkeymac4.png) + +Now we're almost done. Go to your GPG application, click the IMPORT +button in the top left and navigate to your key.asc file on your +computer you just created. Press open and see the magic happen as the +key is being added to your keychain. + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/importkeymac5.png) + +Now...there is a much easier way to import new keys and that's why I +kind of insisted on your uploading your public key to a keyserver. If +you go to your GPG application, select **Key** (in the menu bar on top +of the screen) and then **Search for key** you will be promted with a +little window: + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/importkrymac6.png)In +that window you can search for an email adress or parts of it to find a +key. To find my public key simply search for katharina.sabel. + +I kinda fucked up my keys a few months ago so I have two keys on the +server. Select the one that was created last (\~August 2013) to add the +key to your keychain. You won't have to deal with any of the hassle +including file formats, copy pasting, etc. It's all done. + +Feel free to hit me up with a random message to +sabel.katharina@gmail.com. Be sure to encrypt it, just to test things +out. And I hope that this tutorial will encourage you to encourage more +of your family and friends to use encryption. If not for transmitting +sensible documents like contracts, bills or whatever just to piss off +the NSA :) + +Have a lovely day, + +\~Kate diff --git a/teaching/encryption/03-encryption-101-pgp-on-ios.md b/teaching/encryption/03-encryption-101-pgp-on-ios.md new file mode 100755 index 0000000..8e841b9 --- /dev/null +++ b/teaching/encryption/03-encryption-101-pgp-on-ios.md @@ -0,0 +1,161 @@ +Title: 03. Encryption 101: PGP on iOS +Date: 2013-10-17 12:46 +Category: Data Privacy +Tags: Guides +Slug: 03-encryption-101-pgp-on-ios +Status: published + +Next up in this series: iOS. I discovered this application by accident +today and wanted to write about it. First up three things you will need: + +1\. A keypair of private/ public key already generated on your computer. +It's easier this way. + +2\. This application for money: +<https://itunes.apple.com/us/app/ipgmail/id430780873> + +3\. An iOS device (duh!) + +First +of all install the app on your device (in my case an iPhone). In the +meantime you should search for your connection cable because you'll hook +up your device to your computer. + +While you wait for the installation to be finished you can also export +your keypair on your computer. If you're using a Mac click +[here](http://www.spacekookie.de/02-encryption-101-pgp-on-mac/#exporting) +to find out how. If you're using Windows click here (To be added with +the future tutorial!) + +Unlock your phone, open the IPGMail App and on your computer open +iTunes. In iTunes, select your iOS Device in the top right +corner[](http://www.spacekookie.de/wp-content/uploads/2013/10/iospgp2.png). +Select "Apps", scroll down until you reach the area shown in the +screenshot. There select the iPGMail App and select "Add". Navigate to +the directory on your computer where you exported your key pair and add +it. Note that for this to work you need to have the IPGMail App open on +your device, otherwise you might get an error about writing +persmissions! + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/iospgp3.png)With +that done close iTunes and turn your attention towards your iOS device +again. + +In the application you will see a few tabs. Most of them are self +explanatory: Keys, Compose, Decode and Settings. The "Files"tab holds +the key that you just moved into the app. Tap on the tab, select the key +pair you imported and select "decode" in the upcoming context menu. +**THIS WILL TAKE A WHILE!** So be sure to get some coffee or read a book +in the mean time. + +At some point the application will prompt you for a password. Enter the +passphrase that you chose for your PGP key during generation. For some +advice on how to handle your keyphrase (if it's longer) click +[here](#passphrases-storage). + +You're almost done. You will see the freshly imported Private key in the +Keys-tab. You can either import public keys the same way OR you can +search for them. That's why it's important to upload your key to a +keyserver ;) + +Go to the public Keys tab, press the "+" and for the server select +"pgp.mit.edu:11371". That's where I store my key on (and that is AFAIK +the most common). Then you can search for an email adress again, like +mine: sabel.katharina@gmail.com. + +When composing an email you need to select your private key as the +sender, a public key as the recipient and wether you want to sign and +encode or just do one of the two. Type your message and hit the +"export"[](http://www.spacekookie.de/wp-content/uploads/2013/10/IMG_0056.png) +symbol in the top right corner of the screen. + +The application will promt you for a password again. This is your +keyphrase, so have fun typing it in :) Again, later in this tutorial +I'll give you a bit of advice on that! + +After the encryption the content will be exported into the standard Mail +App of iOS where you will be able to set a subject that isn't encrypted +and then send the message. This is what that should look like with an +example message to my brother again: + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/IMG_0057.png) + +<a name="passphrases-storage"></a> + +**How to handle your passphrase for Email encryption** {style="text-align: left;"} +------------------------------------------------------ + +If you're like me and have a massive passphrase for your PGP key it can +be a bit of a pain to enter it each time you want to do anything. Having +a long passphrase is good but entering is annoying. There are multiple +ways to store your passphrase for copy-paste use. Here in descending +order of security: + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/IMG_0060.png)**1. +1Password +** [http://agilebits.com/** +**](http://agilebits.com/) + +1Password is a password management application for Mac, Windows, +Android, iOS and webbrowsers. You store your passwords in an encrypted +keyfile that can be unlocked using a different password, that needs to +be pretty secure as well. I use the app for all my password managing and +can thus generate random strings of characters of 30 to 50 bits of +length for any account I make. my PGP passphrase is 32 bits long. + +Just keep your PGP passphrase in there and it's as secure as it can be. +The keyfile for 1Password can be synced via WiFi, local file transfer or +stored in Dropbox. Dropbox is pretty unsecure however as the keyfile is +encrypted with your (hopefully endless) password as well it's manageble. + +Unfortunately this is pretty pricy. The iOS App is 16€ in addition to +the Desktop bundle which is another 50€ + + + +**[](http://www.spacekookie.de/wp-content/uploads/2013/10/IMG_0061.png)2. +SpiderOak +** <https://spideroak.com/> + +SpiderOak is a zero-knowlege encrypted Cloud storage service. Every file +you upload is locally encrypted on your computer using a passphrase and +then uploaded and stored on the servers of SpiderOak in encrypted form. +The basic account offers a 2GB of space for free (for life) with all the +clients included. Additional space is 10\$/100GB! + +Store your passphrase in a text file in your spideroak hive folder +(which is kinda like a shared instance between all your devices) to copy +and paste it whenever you need to send an encrypted email. The +passphrase will be 100% secure in your cloud storage (you could actually +place your private key in here!) but the problem is that anyone with +access to your phone will have access to your spideroak files unless you +want to enter that password on each login again as well. + +If you're interested you can use my referral link and get 1GB +additonally for life: +<https://spideroak.com/download/referral/7ed9de0ea80f09d88e97f90f23830dde> + + + +**[](http://www.spacekookie.de/wp-content/uploads/2013/10/IMG_0062.png)3. +Evernote (Really unsecure!!!)** +<https://evernote.com> + +I'm just including this to make the list complete but don't actually do +this if you can do anything else. Evernote has a horrible horrible +horrible [...] horrible encryption and it's just about as saving your +passwords in plain text. I have to admit, I did this a while ago because +of the lack of other options but it's really not a good thing. Evernote +has a lot of amazing tools and for clipping articles found on the web, +sharing notes with others etc it's a great tool. Just for privacy issues +I wouldn't recommend storing any sensible information in an Evernote +file. + + + +That's it for today. If you have any questions/ sugestions/ whatever, +post them in the comments below. And until next time. + + + +\~Kate diff --git a/teaching/encryption/04-encryption-101-pgp-on-windows.md b/teaching/encryption/04-encryption-101-pgp-on-windows.md new file mode 100755 index 0000000..0c4bdb0 --- /dev/null +++ b/teaching/encryption/04-encryption-101-pgp-on-windows.md @@ -0,0 +1,227 @@ +Title: 04. Encryption 101: PGP on Windows +Date: 2013-10-17 19:32 +Category: Data Privacy +Tags: Guides +Slug: 04-encryption-101-pgp-on-windows +Status: published + +After writing about the +[Mac](http://www.spacekookie.de/02-encryption-101-pgp-on-mac/ "02. Encryption 101: PGP on Mac") +and +[iOS](http://www.spacekookie.de/03-encryption-101-pgp-on-ios/ "03. Encryption 101: PGP on iOS") +versions of PGP Mail encryption I want to explain the whole ordeal for +Windows computers now. As for the Mac version the tutorial will be split +in two parts. The first about setting up a Mail client (Thunderbird in +our case) to download emails from your hoster and the second about +actually encrypting emails. If you have done this already you can skip +[AHEAD](#encrypting)! Let's get started. + +**Setting up Thunderbird** {style="text-align: justify;"} +-------------------------- + +Windows doesn't come installed with a very good mail software and so +it's recommended to use a third party application. Mozilla is doing a +really good job with their projects and Thunderbird is one of the better +mail programs out there. You can download the latest version of +Thunderbird here: +[www.mozilla.org/thunderbird](http://www.mozilla.org/thunderbird/).[ +](www.mozilla.org/thunderbird/)Once downloaded, install the application +onto your main hard drive and open it afterwards. + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/winpgp1.png)Confirm +to use Thunderbird as your standard mail application. Dismiss the setup +helper thing. Then go to the account settings as displayed in the +screenshot above. On the upcoming window click the "Account Actions" in +the bottom left corner and then select "New Mail Account". In the +upcoming window you should then insert your Mail account settings as +shown in the picture below. + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/winpgp3.png) + +Confirm with Continue and in the upcoming screen select "IMAP", not +"POP". If you're using a mainstream hosting service this should be +trivial. If you're using a smaller one you might have to read their FAQ +for server information. + +After the setup is done be sure to fetch your email once to check if the +settings are really working. Now we're ready to set you up with GPG +which is a software suite to encrypt emails. + +<a name="encrypting"></a> + +**Encrypting E-Mails +** {style="text-align: justify;"} +--------------------- + +First up you need to go and download the Enigmail software suite. You +can do so here: <https://www.enigmail.net/download/>.Be sure to select +the right version of Thunderbird. Also note that the 32bit Version of +Enigmail works fine on 64bit Windows machines. + +Download the file and save it on your Desktop. It's not something you +can run directly. To install it go back to Thunderbird and navigate to +your Add-Ons tab. + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/winpgp4.png)Then +select "Extensions" in the tab and drag&drop the downloaded file into +it. There will be a window popping up prompting you to confirm the +installation. + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/winpgp5.png) + +After the installation is complete you need to restart your Thunderbird. +When you open it again there will be a friendly Setup Wizard waiting for +you. Give it a hug and move on by choosing the "easy" (top) option. + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/winpgp6.png)It +will tell you in the first step that you need to install GNU PG which +stands for "GNU Privacy Guard". If you read my Mac tutorial you will be +familiar with that application and know that it's pretty cool and won't +eat your computer. Agree to the installation and follow the instructions +as followed (Not much to do wrong). + +After that is done it should look a bit like this. + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/winpgp7.png)Continue +by clicking Next. + +Next up the Wizard will ask you if you already have a key or need to +creat one. If this is your first device you want to use PGP with you +need to create a key pair and I will roughly explain what they are for. + +PGP works with two set of keys: public ones and private ones. If you +want to send somebody an encrypted message, all you need for that is +their public key. That key will be downloadable on a keyserver and can +be sent around as attachments on emails. The email will be secure and +only readable by somebody with the corresponding private key (which +should only be the owner ;) ). So to summarize: Public key to lock, +private key to unlock. You will collect the public keys of many people +but only have one private key that you should **NEVER (!!!)** send +somewhere over the internet. Use encrypted spaces and preferibly USB +drives to transport it to different computers! + +So again: If you already have a pair of keys from one of my previous +tutorials select the green option to import it. If you need to create a +new one, select the red option. + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/winpgp8.png)I +will be focusing on creating one now. At the end of the tutorial I will +add some things about exporting and importing as well. ([Click +here!](#key-management)) + +Next up you will have to choose a passphrase for your key. It should be +at least 10 characters long (the longer the better, really. Mine is 30 +bits long, randomly generated). Also be sure to move the mouse as much +as possible during the generation. It gatheres so called "Entropy" to +randomize the key as much as possible (Computer randomizer aren't very +random). + +You should answer the following questions accordingly: + +1. Don't sign every email. It will just confuse people that have no + idea what's going on +2. Don't attach your public key to every message you send for the same + reason as 1. +3. Let Enigmail change some of Thunderbirds settings to run more + smooth. + +And congratulations. You're done! :) + +There are of course still a few things to be learned but this is it in +general. You are now able to send and recieve encrypted emails. But +let's check out a few more things. + +[](http://www.spacekookie.de/wp-content/uploads/2013/10/winpgp9.png)Under +"Sender's Key" you could edit your own key and see details about it. But +more importantly is the "Key Management" as you will be able to see, +import and export your key from there as well. Why don't you send me an +email as a test? + +First go into the Key Management, then click on "Keyserver" and "Search +for Key". Type in my email adress (sabel.katharina@gmail.com) and search +on the server pgp.mit.edu (not sure why it's not initially part of the +list). Because I kinda fucked up my keys a few months ago there are +multiple on the server. Select the latest one (From Juli-August 2013, +not sure what date exactly!) + +Now you'll be able to send me a message. Compose a new message in +Thunderbird, type in my address and write a message. In the bottom right +you can choose if you want to sign the message (the pen) and/ or if you +want to encrypt it (the key). Note that the subject of a message won't +be encrypted, only the body and attachments! And also note that +encrypting several gigabytes of data in a message WILL take a long time +;) + + + +And that's it! You're not communicating without anyone else knowing what +you're talking about, except the person you're contacting of course. +Even if you have nothing to hide (I know I don't), do it just to piss +off the NSA. Because this is what they'll see: + +``` {.lang:default .decode:true} +-----BEGIN PGP MESSAGE----- +Charset: ISO-8859-1 +Version: GnuPG v2.0.22 (MingW32) +Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ + +hQEMA7SvZRFbvA8gAQf+IQTNnWLmQi2HX5dFJ85QcL0QfznMDVcEKWN+mk04u9W8 +WoQ8SIBVuY6sil6y9k6qLYzVaJ1XuXC9PxOow0O5KkwQ595ZSvolAbi6acITnlv7 +A361a6eN5pvoMjQexDdklqcWs3JeyU7AXSSKnshltfS1Xw2BeMdsyq7D0PpMLbRC +KZvdRv8zp3loEEyqVFwpMngEqtKFVsvIrQ+5Ipzk7LM4bNh1D790EUBv9FAvufVo +h/+NAdE/264tRROff1G1p47K52s/HwYUqmpw2BmHPL2WXUG1yT8obCgpZYE3bWS3 +Uly5JiUfnrxs5xGMQVGJ2NcaOwLecAJwRo1rpnnNnNLA1wGB1VQcpk4Vw4UiRCY3 +6YDJXr2EfN0qQpKVdfnzjNopUnYyJOHC9UdfBXRdIGUh4j+aQanZrfKps1LPpWPF +la4u4n3CS4G83WPhry7xWdCkK5ZQba5pOTKP68SRXvFxc8FtQyh9OeP39hVLo+TW +1toRKu037Lhg7XlNYgil2YDe9/MjDWTAjWwBVQK6R4ZGnpKdUWbACQ/FHEliYRHa ++vQGMsPuIeBtCeAgQR1rjTAhTZP0r4+x66lpwn4BeasCXyIID6cOfgMRstM+5rKi +Fu3X2qzp7ZFLIdtFPbgKdTrldua4RKaRYL9TNBXhzChsvsNzKx32DTeRO/FsPxW3 +d9FZBLisnoincmwtjlg5Miz9aIygJuM0k1J1k6VnKGl265HkgRcmz4xmGuNOdZdQ +qLhgHnGLJ+M6LD8bwOVy7yNqRQLeFy/qmXGtJgW3ZD1K28zLnHPhNhhfvV0yahI+ +APKM0bGMm6MeBsoGkUlgOSOvP+GA4xN/lB3kXcrbfKUyt2a3WVBQcNvHS69+ROrX +T+flxWu/30ZM +=crxN +-----END PGP MESSAGE----- +``` + +One last thing about this: Because the encryption is done on your +computer (Inside Thunderbird) nobody else can see what the original +content is unless you view it in Thunderbird. But that also means that +if you log into your email account in your Browser you will see the +Jibberish as well. Be warned! + +<a name="key-management"></a> + +**Importing and Exporting Keys** {style="text-align: justify;"} +-------------------------------- + +Last but not least I want to show you how to import and export keys. Say +you want to use PGP on your iPhone? Good, I have an awesome tutorial for +that here ;) + +But you'll need to export your key. The same goes if you are using PGP +on a different computer already and just want to import your existing +key to this computer. + +Under the "Key Manager" I showed you before click on "File" and "Import +Keys from File". Then navigate to the directory where your key is stored +and make sure it's in an ASCII armour file (.ASC) + + + +If you want to export a key that is equally simple. Select your key in +the list (If you don't see it check the option "Display All Keys by +Default", right click on it and then Choose "Export Keys to File". + + + +This will save your Key as an .ASC file to be imported by other PGP +applications such as GPGMac or iGPMail on iOS. + +I hope you learned something today and I also hope that you'll go spread +the usage of email encryption around your friends. If you have +questions, sugestions, whatever, leave them in the comments below. + +And until next time, have a lovely day. + +\~Kate diff --git a/teaching/encryption/05-encryption-101-pgp-on-linux.md b/teaching/encryption/05-encryption-101-pgp-on-linux.md new file mode 100755 index 0000000..354d921 --- /dev/null +++ b/teaching/encryption/05-encryption-101-pgp-on-linux.md @@ -0,0 +1,142 @@ +Title: 05. Encryption 101: PGP on Linux +Date: 2015-10-27 09:00 +Category: Data Privacy +Tags: Guides +Published: false +Slug: 05-encryption-101-pgp-on-linux +Status: published + +It's only been around a million years since I last wrote about this stuff :) Back when I started this series I was still using OSX and obviously focused very heavily on Mac, iOS and the likes and could barely get myself to write a little tutorial about e-mail encryption for Windows (only because friends nagged me about it). + +But that's all different now. I've been almost exclusively using Linux for the last year (maybe 1 1/2 years) and I thought I'd give the PGP toolchain on Linux also called Gnu Privacy Guard (GPG) some love. So shall we begin? + +### Setting up GPG with Thunderbird + +So most people will be using a mail client - I use Thunderbird because *reasons* - so let's focus on that for now. And to be honest...that's kinda boring. Please have a look at my guide on how to set up Thunderbird with Enigmail on Windows because on Linux (because of Thunderbird) it works pretty much the same way. + +**The jist** + +`sudo $package_manager install thunderbird` + +With + +Fedora 22+ `dnf` +Fedora 21 and earlier `yum` + +Ubuntu `apt-get` +New Debian stuff `apt` + +Arch `pacman` or `yaourt` + +You get the idea... + +Install the Enigmail plugin like described [here](http://spacekookie.de/data-privacy/04-encryption-101-pgp-on-windows/)! + +### Getting to know the CLI + +`gpg2` is a command that is installed on basically any modern Linux Distribution. And it comes with a plethora of options. It can do signing, message encryption with RSA, symmetric ciphers, hashing and compression. + +Let's start with creating a new key. Like you might have read in the other tutorials GPG/ PGP uses asymetric encryption which means that you need a key-pair to use it. One key is public, for everybody to have and use, the other one is private, only for you to decrypt messages. + +`gpg2 --gen-key` drops you into a nice interactive program that helps you generate a keypair and automatically adds it to your personal keychain. For all the other commands in this post to make sense you should have a keypair around to try everything out for yourself. + +After you have a keypair you can go and list your keychain. + +``` + ❤ (idenna) ~> gpg2 --list-keys +/home/spacekookie/.gnupg/pubring.gpg +------------------------------------ +pub rsa4096/0022A74E 2014-08-16 [expires: 2020-08-16] +uid [ultimate] spacekookie (Hack the planet!) <spacekookie@c-base.org> +sub rsa4096/FEAAFEA5 2014-08-16 [expires: 2020-08-16] +sub rsa4096/3B1D08AC 2014-10-30 [expires: 2016-10-29] + +``` + +You can of course also just get the fingerprint off a certain key. For that you either need your e-mail address or your key ID. + +``` + ❤ (idenna) ~> gpg2 --fingerprint 0022A74E +pub rsa4096/0022A74E 2014-08-16 [expires: 2020-08-16] + Key fingerprint = 6B93 6393 9583 E61C 9AD7 16AE 64EF 9E1B 0022 A74E +uid [ultimate] Katharina Sabel (Personal) <katharina.sabel@mailbox.org> +uid [ultimate] spacekookie (Hack the planet!) <spacekookie@c-base.org> +sub rsa4096/FEAAFEA5 2014-08-16 [expires: 2020-08-16] +sub rsa4096/3B1D08AC 2014-10-30 [expires: 2016-10-29] +``` + +I usually end up using my fingerprint ID just because it's shorter to type. And I actually have quite a nice one to remember C: + +### Import & Export + +We can also export keys from our keychain. + +``` +gpg2 --export 0022A74E +\(j�ڀ���sO�έ5'�bQ�6 + �U\�1���~ꢟSSÜu��-���䡘<|�1����Gd{�&K�c<�. + ?��r�&,s�� + :�\����ـo�T'e��kT��g�����g�p. +U���d)�V��?Sk��0w���o��6� �%�i�N�M��$%ڶr_2q��� + o~��'��0��p)���5�k]��F�L�ks���ؙ��z��J�Pt}?�*� + �'6���q�8�f�]�m8m�s:ӕ�pԾz�?�ϴ|��f�B<ѹ�#�m�Gߞ���q 5���Y�sAIV<��.^$ޘ���f}�/�?��(��B� +������%0068b��dAK>�� {'���n� + �c���JT� qz���� + �NM���U9��UP�諤wĸ��ds�CW_�)�s���Qc����iË�(���!�lv���� �� +``` + +But you'll notice that's in binary. To get something more human readable you can pad it in ASCII Armour with `-a` for something more managable. + +``` +❤ (idenna) ~> gpg2 -a --export 0022A74E +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQINBFPvZQMBEADMRx7NgsAUBPHR4V5rNvANXChqs9qA+oqvc0/Izq01J+xiUcEM +31VcGKoxxv3Bfuqin1OPkFPDnHUOxecti5H15KGYPHylMdbD5M4UR2R7uiZLoGM8 +yi4LP8GjcsAmBSxzA4H0DI83OqJc+YX5tNmAb+VUcggPJw4BZaO8a1SYDt5npRWA +DqPL72f2cC4Luhj4XngN5xim5if7myiqK9mY6FJhmJKzBxwD+mPgd+GMp2kCmQc5 +JeKkQRmagN+b2Q1VEpL51WQpoFao4T9Ta5eqMHf7vZtvF4S2Nt4dILklu2n1TqtN +mq0kJdq2cl8yBXEWqp8T1AxvfsYU2CfnnzDh33Ap5BKstRc1imsHXdbFRuZMgmtz +``` + +The same way you can import keys either from a server +``` +gpg2 --keyserver gpg.mit.edu --recv 0022A74E +``` + +or if you received an e-mail with someone elses key (or you nicked it off their website *hint hint*) you can import them as well + +``` +gpg2 --import 0022A74E.asc +``` +and it'll show up in your keychain. + +### Signatures + +You can of course also sign messages with your private key to let people know that it was really you who sent a message. Maybe a public statement or a blackmailing threat. Whatever floats your boat. + +``` +gpg2 --clearsign file.txt + +``` + +It will result in a file like you can find [here](https://spacekookie.de/pgp/spacekookie-on-the-tubes.txt). +You can of course also sign keys or not have clear signed messages but only signatures for specific messages with `--detach-sign` and `sign-key`. + +### Encryption + +Of course the primary idea of GPG is to provide e-mail/ message encryption. It's fairely straight forward with +``` +gpg2 -a --encrypt message.txt + +``` + +You can combine that command with a signature and even remove the ASCII Armour if you want the binary output of the file. +And that's that. You can send that to someone now. Or print it out and hang it on your wall or whatever. + +--- + +I don't think most people will ever care about using GPG as a commandline tool but I think it's important that people understand how to, if they ever end up in a situation where they do. I also hope that this post has been somewhat useful to you. And wish you happy message encrypting :) + +~Kate
\ No newline at end of file diff --git a/teaching/gameofcode/01-libgdx-game-of-codes-the-setup-basics.md b/teaching/gameofcode/01-libgdx-game-of-codes-the-setup-basics.md new file mode 100755 index 0000000..c43613f --- /dev/null +++ b/teaching/gameofcode/01-libgdx-game-of-codes-the-setup-basics.md @@ -0,0 +1,365 @@ +Title: 01. (LibGDX) Game of Codes: The Setup & Basics +Category: Game of Codes +Tags: Guides +Slug: 01-libgdx-game-of-codes-the-setup-basics +Status: published + +Hey everybody and welcome to a new/ old series on this blog about LibGDX. + +LibGDX is a Java game development framework based on LWJGL and OpenGL which makes it relatively easy to make a game from scratch without requiring a big engine. It supports Desktop, Android, iOS and HTML as export targets which means that your game is automatically cross platform. + +Getting to know the framework can be challenging in the beginning, which is why I wanted to make a little series about it. Before I moved my blog to a static site generator I had a rather popular series about LibGDX called "Game of Codes". Unfortunately large parts of the guides are now outdated and no longer relevant. And the Wordpress export destroyed most of the formatting. + +Which is why I decided to rewrite them. Here it is: the Game of Codes! + +NOTE: This tutorial requires a basic level of programming/ scripting skills. General Java knowledge is required or at the very least knowledge of how coding works. If you don't know that yet then I +recommend [Bucky Roberts Java Programming series on Youtube](https://www.youtube.com/watch?v=Hl-zzrqQoSE&list=PLYJQBQw9Wdiid6eT1_DqBP3lnbJCzo3s8). +It's very good! + + +### Setting up LibGDX + + +Now that we've got that out-of-the-way let's set up our workspace to +make some neat games. + +1. First of all you'll need to have Java and an IDE installed on your computer. I recommend Eclipse. For pointers on how to install those please use Google. +2. Go to [http://libgdx.badlogicgames.com/](http://libgdx.badlogicgames.com/) Downloads and download the framework. You can either go for a nightly build (that will contain more awesome features but probably bugs) or the stable version. Current stable at the time of writing this is 0.9.9 and the version that I will be using (and am using for all my projects). +3. Save and extract the libgdx-0.9.9.zip file somewhere on your computer and open up the folder. You'll see a multitude of things. Now…we could set up an Eclipse project, import all the right files and write some dummy code but there is an easier way to do this and it's called the Setup-UI. The following two screenshots will explain the basics. This should be trivial but I'll still go over it. Feel free to skip to the next part below. + + + +The following steps will be conducted in the .Jar setup UI. On the upcoming window click on CREATE and then fill out the information on the next screen. Everything you need to consider is being marked as red in the next screenshot. + + + +Make sure you already have the directory created that you want to put the project in. The java UI can NOT create folders. Be sure to disable the iOS project. It won't break anything if you leave it ticked but we won't be working with it. + +During the selection of the libraries you need to select the folder icon and then point the application at the archived .zip file you downloaded in the beginning for LibGDX and press the other little arrow button for the Universal Tween Engine to download it. The Jar isn't included in the LibGDX package by default but it can come in handy later. When you're ready to continue everything should light up green. Click on OPEN THE GENERATION SCREEN to continue, click LAUNCH and watch the magic happen. + + +### Working with LibGDX + +Now that we have an auto generated LibGDX project it's time to import it into Eclipse and look at the actual code. Go into Eclipse, File --\> Import. Select General --\> "Existing Projects into Workspace". Navigate to the path and check that all your LibGDX projects are shown as in the screenshot below. Afterwards you should be set to do some serious coding! + + + +NOTE: LibGDX works very close with Android and when you import the +project you will see the Android project having exploded because of +various issues. Make sure that you have Android set up on your computer. +If you don't, may I refer you to an older blog post of mine: This will +explain the setting up of Android. + +That's important, as LibGDX uses the Android assets folder as a link to +the main project. You can change that, if you want. But we'll leave it +as is for now! If you're having issues with this step, post your problem +in the comments below and I'll try to help you resolve it. + + + +Now that everything should be ready to go, let's check what kind of code +we have here and understand the basic structure of LibGDX. As you've +already seen there are several projects that were just created: three +projects with suffixes (-android, -desktop, -html) and a core project +without a suffix. All the actual coding will be done in the core project +while the other projects are called "deployment projects". In them you +can adjust platform specific code to deploy your software. But for now, +we will only be working with the Core project and use the desktop +deployment for debugging. + +NOTE: Make sure that you leave your Android project open, as LibGDX uses +the androids Assets folder for all the other projects. + + + +Now, that we have this figured out, go to your core project and open up +the only class that there should currently be in there. Mine is called +TutorialsLauncher and it has a certain layout of methods in it that +LibGDX always uses. + +- **public void create()** - Called when the game is created +- **public void resize()** - Called after create and every time the + window is resized (if that is allowed) +- **public void render()** - Starts calling after create() and + resize() and will be recalled every frame. This is your game loop! +- **public void pause()** - Called when the game is closed on Android +- **public void resume()** - Called when the game is re-opened on + Android +- **public void dispose()** - Called when the game is closed. + +This layout allows for very structured code to be written. An +interesting thing to note is that this layout comes from the +implementation of the **ApplicationListener** interface. So when you +create your own main game class you just implement that interface and +it'll suggest the code layout for you automatically. + +Before we look at the code in more detail and see what it actually does +we should launch the application though and see what it looks like. For +that you'll need to create a Run Configuration for a Java Application +and point it at the Main class in your \*\*-Desktop project. A new +window will open and TADA! The dummy "game" :) + + + +Now let's look at the actual code that does stuff: + +``` {.width-set:false .lang:java .decode:true title="Create Method"} + @Override + public void create() { + float w = Gdx.graphics.getWidth(); + float h = Gdx.graphics.getHeight(); + + camera = new OrthographicCamera(1, h/w); + batch = new SpriteBatch(); + + texture = new Texture(Gdx.files.internal("data/libgdx.png")); + texture.setFilter(TextureFilter.Linear, TextureFilter.Linear); + + TextureRegion region = new TextureRegion(texture, 0, 0, 512, 275); + + sprite = new Sprite(region); + sprite.setSize(0.9f, 0.9f * sprite.getHeight() / sprite.getWidth()); + sprite.setOrigin(sprite.getWidth()/2, sprite.getHeight()/2); + sprite.setPosition(-sprite.getWidth()/2, -sprite.getHeight()/2); + } +``` + +First thing the code does is log the current resolution of the game and +store them in two float variables. + +Next up we create a camera, set up with the ratio of the resolution we +just stored in the variables. (We'll talk more in-depth about cameras +later) + +The next block loads a texture from the data folder which is stored in +the Androids assets folder and applies a linear filter (If you want to +learn more on that click +[here](http://gaming.stackexchange.com/questions/48912/whats-the-difference-between-bilinear-trilinear-and-anisotropic-texture-filte)). +Don't worry if the rest of that class looks like alien text. I'll +explain renderings, drawings, textures etc. in more detail in a later +article. For now you just need to know: it's setting up a sprite +(texture). + +Next up in the code we have dispose: + +``` {.width-set:false .lang:java .decode:true} + @Override + public void dispose() { + batch.dispose(); + texture.dispose(); + } +``` + +Objects that use anything with OpenGL need to be disposed (should. it's +good practise). It's not that important if you quit the application but +rather when changing screens (more on that later too). + +Which brings us to the main method doing stuff in this "game". Render(): + +``` {.width-set:false .lang:java .decode:true} + @Override + public void render() { + Gdx.gl.glClearColor(1, 1, 1, 1); + Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT); + + batch.setProjectionMatrix(camera.combined); + batch.begin(); + sprite.draw(batch); + batch.end(); + } +``` + +The first two calls are OpenGL specific and absolutely need to be in +there. It clears the screen completely and then draws over with a colour +(actually ClearColor only sets a colour and the glClear clears the +screen and draws the colour but more to that later too). + +Then comes the tricky part. + +"batch" is the SpriteBatch that was created earlier in the create(); +method. It's essentially handling texture mapping to the screen and uses +the cameras viewport (aka what the camera is looking at and how many +pixels it contains) to properly map the texture to the screen. It's +begun, then a sprite is drawn and then it's ended. (That's how you draw +things low-level with OpenGL). And that's the game loop. + +Depending on how the window is scaled this means that the texture will +always look (more or less) right because it's being adjusted to the +camera viewport (which is essentially just the entirety of the +application window. + + + +I know that this was a lot to take in for now. But I'll touch these +topics in later articles (again). And if I don't then there are plenty +of great resources out there (probably better than these :) to help you +around. + +However, I want to do one more thing here and that is give this Game a +more Game-y feeling. First of all you should head to the image processor +of your choice (in my case Photoshop) and sketch up something that might +look like a spaceship. + + + +Make sure that the size of the image is by the power of 2 (so 2, 4, 8, +16, 32, 64, 128, 256, 512, 1024, 2048, 4096, etc. because that's how +LibGDX works. + +What you say? You're too lazy? You don't have an image processing +application? You managed to delete Paint from your computer? Kudos. Use +[this](http://www.spacekookie.de/downloads/Tutorials/LibGDX1/USS_Pixel.zip "USS Pixel") +then! Next up we want a picture of space. I'm not gonna make something +myself here. And neither will you (most likely). How about +[this](http://www.wallsave.com/wallpapers/1024x1024/galaxies/236804/galaxies-cool-galaxy-and-space-ipad-236804.jpg "Space")? + +Save both of these on your computer and import them into your +Android-projects assets folder (copy, not link!) Next up we want to +adjust a bit of our code. If you use external resources they always need +to be as power-of-two pictures. And to overcome that there is a thing +called a TextureAtlas (SPOILERS). But I'll touch that later. + +For now, we just need to change the path in one line: + +``` {.width-set:false .lang:java .decode:true} +texture = new Texture(Gdx.files.internal("space.jpg")); +``` + +I made it easy on me and just renamed the picture into "space" and moved +it into the assets folder which in LibGDX internal files is being +referenced as root. If you compile this you'll see two white bars on the +sides. So first, we might want to change that to black to make it +more…space-y but secondly we might want to change the starting +resolution of the game. If you were observant before you know where to +change the OpenGL colour. That's right. Here: + +``` {.width-set:false .lang:java .decode:true} + @Override + public void render() { + Gdx.gl.glClearColor(1, 1, 1, 1); +``` + +It uses R-G-B composition colours referenced with floats. The fourth is +the alpha channel. So to get Black we want to set it to + +``` {.width-set:false .lang:java .decode:true} +Gdx.gl.glClearColor(0, 0, 0, 1); +``` + +For the resolution we need to check our platform-specific launcher. In +our case we have to check the Main method in the \*\*-Desktop project +and adjust two things. First, we want the starting resolution to be +800x600 as that's what the TextureRegion cuts from the original texture. +And we want to disable the ability for the window to be resized (for +now) as it adds a whole mess to take care of. + +``` {.width-set:false .lang:java .decode:true} + cfg.resizable = false; + cfg.width = 800; + cfg.height = 600; +``` + +So essentially we need to add one line to the configuration and change +two. + +However, we're not done yet. We gave the texture the new path to import. +But that's not all. We need to tell the texture region what part of the +cake to slice from the original texture. And we also need to change some +of the positioning that happens. Essentially you want your code to look +like this: + +``` {.width-set:false .lang:java .mark:6,12,15 .decode:true} + @Override + public void create() { + float w = Gdx.graphics.getWidth(); + float h = Gdx.graphics.getHeight(); + + camera = new OrthographicCamera(w, h); + batch = new SpriteBatch(); + + texture = new Texture(Gdx.files.internal("space.jpg")); + texture.setFilter(TextureFilter.Linear, TextureFilter.Linear); + + TextureRegion region = new TextureRegion(texture, 0, 0, 800, 600); + + sprite = new Sprite(region); + sprite.setPosition(-sprite.getWidth() / 2, -sprite.getHeight() / 2); + } +``` + +I changed the camera setup to just simply use the width and height as +it's viewport, told the texture region to cut a 800x600 part from our +1024x1024 texture and removed the size and origin manipulation. Now +compile this and BOOM. + + + +Shiny! \<3 Now we need some slick advertisement and EA will sell this +for 60\$ (+ DLC of course). + +Now…we have that ship. Let's just quickly add the ship in idle state in +the middle of the screen before this post gets too long. You should know +how to add the space ship texture by now: + +``` {.width-set:false .lang:java .mark:4-5,21-25,32,43 .decode:true} +public class TutorialLauncher implements ApplicationListener { + private OrthographicCamera camera; + private SpriteBatch batch; + private Texture texture, shipTexture; + private Sprite sprite, ship; + + @Override + public void create() { + float w = Gdx.graphics.getWidth(); + float h = Gdx.graphics.getHeight(); + + camera = new OrthographicCamera(w, h); + batch = new SpriteBatch(); + + texture = new Texture(Gdx.files.internal("space.jpg")); + texture.setFilter(TextureFilter.Linear, TextureFilter.Linear); + TextureRegion region = new TextureRegion(texture, 0, 0, 800, 600); + sprite = new Sprite(region); + sprite.setPosition(-sprite.getWidth() / 2, -sprite.getHeight() / 2); + + shipTexture = new Texture(Gdx.files.internal("USS_Pixel/ship_idle.png")); + + TextureRegion shipRegion = new TextureRegion(shipTexture, 0, 0, 64, 64); + + ship = new Sprite(shipRegion); + } + + @Override + public void dispose() { + batch.dispose(); + texture.dispose(); + shipTexture.dispose(); + } + + @Override + public void render() { + Gdx.gl.glClearColor(1, 1, 1, 1); + Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT); + + batch.setProjectionMatrix(camera.combined); + batch.begin(); + sprite.draw(batch); + ship.draw(batch); + batch.end(); + } +``` + +And voila :) + + + +But this is it for today. I will start working on the next post +immediately where we will discuss input and movement on the screen (all +very basic) as well as TextureAtli (maybe, if you're lucky) + +Until then have a good day/night, + +Kate + + diff --git a/teaching/gameofcode/02-libgdx-game-of-codes-input-movement.md b/teaching/gameofcode/02-libgdx-game-of-codes-input-movement.md new file mode 100755 index 0000000..aa76302 --- /dev/null +++ b/teaching/gameofcode/02-libgdx-game-of-codes-input-movement.md @@ -0,0 +1,345 @@ +Title: 02. (LibGDX) Game of Codes: Input & Movement +Date: 2013-12-18 18:45 +Category: Game of Codes +Tags: Guides +Slug: 02-libgdx-game-of-codes-input-movement +Status: published + +Welcome back to the Game of Codes, an introduction series to the LibGDX +framework. In the last edition we learned how to set up LibGDX in our +Java project and draw pictures onto the screen. We used Textures to +import the image and then drew a Sprite from a specific TextureRegion. +This would allow for multiple assets to be saved in a single texture and +thus saving time when loading assets. + +In this edition I want to show you LibGDXes abilities to handle input +and move things on the screen. This will be all very basic but hang in +there with me. Let's begin. + +Two ways of registering input +----------------------------- + +There are two ways to register input events. The first one is to +directly listen to input events in your main game loop and execute code +depending on what happens. + +[](http://www.spacekookie.de/wp-content/uploads/2013/12/input_raw.png) + + + +The other method is to create an input processor that sorts through all +the input (not just certain types), allows for more complex features +(like dragging gestures on Android) + + + + + +For now, we'll just use the first method. It'll make the process of +input handling very clear. In the second part of this tutorial we'll +have a look at input processor that are mostly needed for mouse and +gesture tracking. + + + +Listening for simple button events +---------------------------------- + +The easiest way to listen for a button-pressed event is by calling + +``` {.lang:java .decode:true} +Gdx.input.isKeyPressed(Keys.W) +``` + +where Keys is an enum index that contains all keys on a regular +keyboard, excluding international characters (Like Ö, æ or å). This +method returns a boolean that can simply be the argument of an +if-statement: + +``` {.lang:java .decode:true} + if (Gdx.input.isKeyPressed(Keys.W)) { + } +``` + +Will run, when the a-key is pressed, if we put this into our games +"render" method. By polling the state of the boolean for the Key "W" +every frame we can get its status whenever the game is running. However +note that this is getting the value indirectly. When a button is pressed +this triggers an event listener to set the boolean to "true" and to +"false" again, once the listener detects that the button has been +released. + +But back to our example. In our case we want the spaceship to fly up, +whenever the "W" key is pressed. Let's take a look at the render method +of our game. + +``` {.lang:java .decode:true} + @Override + public void render() { + Gdx.gl.glClearColor(1, 1, 1, 1); + Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT); + + batch.setProjectionMatrix(camera.combined); + batch.begin(); + sprite.draw(batch); + ship.draw(batch); + batch.end(); + } +``` + +We already use the "ship" sprite in the method. All we need to do now is +update the position before drawing it onto the screen. Unfortunately +there is no direct way to add values to the position of a sprite, only +to overwrite it. So we need to fetch the position first, add our desired +value and then set that new position. The code for that looks something +like that (using the example above where we want the "W" Key to move the +ship up): + +``` {.lang:java .decode:true} +if (Gdx.input.isKeyPressed(Keys.W)) { + Vector2 updated = new Vector2(ship.getX(), ship.getY() + 5); + ship.setPosition(updated.x, updated.y); + } +``` + +Now compile this and press the "W" key and watch what happens. The ship +is moving up. Why? Because with each frame it is being checked if the +"W" key is pressed and if that is the case we add 5 pixels to the +Y-coordinate of the ship sprite. + +We can now continue and do this for all four directions: + +``` {.lang:java .decode:true} + @Override + public void render() { + Gdx.gl.glClearColor(1, 1, 1, 1); + Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT); + + if (Gdx.input.isKeyPressed(Keys.W)) { + Vector2 updated = new Vector2(ship.getX(), ship.getY() + 5); + ship.setPosition(updated.x, updated.y); + } + if (Gdx.input.isKeyPressed(Keys.S)) { + Vector2 updated = new Vector2(ship.getX(), ship.getY() - 5); + ship.setPosition(updated.x, updated.y); + } + if (Gdx.input.isKeyPressed(Keys.D)) { + Vector2 updated = new Vector2(ship.getX() + 5, ship.getY()); + ship.setPosition(updated.x, updated.y); + } + if (Gdx.input.isKeyPressed(Keys.A)) { + Vector2 updated = new Vector2(ship.getX() - 5, ship.getY()); + ship.setPosition(updated.x, updated.y); + } + + batch.setProjectionMatrix(camera.combined); + batch.begin(); + sprite.draw(batch); + ship.draw(batch); + batch.end(); + } +``` + +Note that the "updated" vector is only a local variable inside the +if-statement and can't be used outside of it. Re-using the name inside +each if-block won't have any weird side effects or break the code. + +If you now compile this you'll see that you can move the ship around on +both axis and in all directions but this isn't really a great game yet. +Why? Well...while this might be enough for a retro-side-scroller where +the player only faces up (down) or right (left) for tall intention +purposes, we want the ship to fly around more realistically. So it's +time to introduce rotation to our little game. + +As you might have expected we can simply choose two other keys on our +keyboard (let's take Q and E) and use them to check for other if +statements. In addition to that there is a sprite-method called +"rotate". It should be fairly obvious now :) + +``` {.lang:java .decode:true title="Add this to your render() method!"} + if (Gdx.input.isKeyPressed(Keys.Q)) { + ship.rotate(-5f); + } + if (Gdx.input.isKeyPressed(Keys.E)) { + ship.rotate(5f); + } +``` + +And that's it. Compile and see what happens. Fly around a bit. I'll be +waiting here. + +------------------------------------------------------------------------ + +Oh. You're back quickly. Do I see a hint of disappointment on your face? +:) That's okay. See…we might have changed the rotation in the code, +however the displacement vectors (aka the direction that the ship will +be moved into) isn't in correlation with the rotation, just x and y +values. So the rotation doesn't matter, pressing "W" will move the ship +up, etc. + +Now...there is an easy way to do this and a hard one. I want you to be +familiar with the mathematical basics first before I show you the easy +way. + +[caption id="" align="aligncenter" +width="256"] +x = tan(α) \* y[/caption] + +For each movement the angle of the ship needs to be considered before +moving the ship into the direction of the rotation-vector. Now the easy +way: + +First create a new global vector that holds the speed of the ship and +the direction that the speed should be applied to. In this case 5 pixels +on the Y-axis. + +``` {.lang:java .decode:true} +Vector2 move = new Vector2(0f, 5f); +``` + +Now you need to add a bit of code to the if-statement that checks if the +"W" key is pressed. + +``` {.lang:java .mark:3 .decode:true} + if (Gdx.input.isKeyPressed(Keys.W)) { + Vector2 temp = new Vector2(ship.getX(), ship.getY()); + temp.add(move); + ship.setPosition(temp.x, temp.y); + } +``` + +We're almost done. The last thing we need is to actually rotate the +movement vector by the amount that the ship has rotated. + +``` {.lang:java .mark:2 .decode:true} + if (Gdx.input.isKeyPressed(Keys.A)) { + move.rotate(5f); + ship.rotate(5f); + } +``` + +You can adjust the if-statement to check if the "S" key is pressed but I +removed it from my code for now. + +So this is the full code + +``` {.lang:java .mark:1,9,13-14,17-18 .decode:true} +Vector2 move = new Vector2(0f, 5f); + +@Override +public void render() { + Gdx.gl.glClearColor(1, 1, 1, 1); + Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT); + if (Gdx.input.isKeyPressed(Keys.W)) { + Vector2 temp = new Vector2(ship.getX(), ship.getY()); + temp.add(move); + ship.setPosition(temp.x, temp.y); + } + if (Gdx.input.isKeyPressed(Keys.A)) { + move.rotate(5f); + ship.rotate(5f); + } + if (Gdx.input.isKeyPressed(Keys.D)) { + move.rotate(-5f); + ship.rotate(-5f); + } + + batch.setProjectionMatrix(camera.combined); + batch.begin(); + sprite.draw(batch); + ship.draw(batch); + batch.end(); +} +``` + +Compile the game and enjoy flying around a bit. This is a very elegant +way to handle rotation of an object because the movement logic (move +vector) is disconnected from the rendering logic (Sprite). + +One last thing I want to add in this post is some eye candy. In the next +post we'll have a look at the InputAdapter and get some mouse +interaction into our game. + +First you should add three more texture regions: shipIdle, shipFly1 and +shipFly2 and refactor the code for the textures and the regions a bit to +be less confusing. My refactored code below as reference but you don't +have to do it exactly as I do. + +``` {.lang:java .mark:4-6,22-27 .decode:true .crayon-selected} +public class TutorialLauncher implements ApplicationListener { + private OrthographicCamera camera; + private SpriteBatch batch; + private Texture background; + private Sprite space, ship; + private TextureRegion shipIdle, shipFly1, shipFly2; + + @Override + public void create() { + float w = Gdx.graphics.getWidth(); + float h = Gdx.graphics.getHeight(); + + camera = new OrthographicCamera(w, h); + batch = new SpriteBatch(); + + background = new Texture(Gdx.files.internal("space.jpg")); + background.setFilter(TextureFilter.Linear, TextureFilter.Linear); + TextureRegion region = new TextureRegion(background, 0, 0, 800, 600); + space = new Sprite(region); + space.setPosition(-space.getWidth() / 2, -space.getHeight() / 2); + + shipIdle = new TextureRegion(new Texture( + Gdx.files.internal("USS_Pixel/ship_idle.png")), 0, 0, 64, 64); + shipFly1 = new TextureRegion(new Texture( + Gdx.files.internal("USS_Pixel/ship_fly1.png")), 0, 0, 64, 64); + shipFly2 = new TextureRegion(new Texture( + Gdx.files.internal("USS_Pixel/ship_fly2.png")), 0, 0, 64, 64); + + ship = new Sprite(shipIdle); + } + + @Override + public void dispose() { + batch.dispose(); + background.dispose(); + } +``` + +So we're essentially creating three TextureRegions and mapping the +different pictures of the USS Pixel to it. Lastly, we want the game to +randomly pick one of these three textures when the ship is flying around +to generate an animation effect. For that purpose you should change some +code in the if-statement that checks whether the "W" key is pressed. + +``` {.lang:java .mark:11-20 .decode:true} + @Override + public void render() { + Gdx.gl.glClearColor(1, 1, 1, 1); + Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT); + + if (Gdx.input.isKeyPressed(Keys.W)) { + Vector2 temp = new Vector2(ship.getX(), ship.getY()); + temp.add(move); + ship.setPosition(temp.x, temp.y); + + int i = new Random().nextInt(2); + if (i == 0) + ship.setRegion(shipIdle); + else if (i == 1) + ship.setRegion(shipFly1); + else if (i == 2) + ship.setRegion(shipFly2); + + } else { + ship.setRegion(shipIdle); + } +``` + +Now compile this and enjoy. + + + +You should now know how to handle basic keyboard input, how to properly +process it and also to move things on the screen more intelligently than +just to adjust their pixel coordinates manually. In the next issue I +want to introduce you to the InputAdapter but I feel that it would drag +this post out too much. So until next time, keep coding. diff --git a/teaching/gameofcode/03-libgdx-game-of-codes-input-movement-2-0.md b/teaching/gameofcode/03-libgdx-game-of-codes-input-movement-2-0.md new file mode 100755 index 0000000..6f5e208 --- /dev/null +++ b/teaching/gameofcode/03-libgdx-game-of-codes-input-movement-2-0.md @@ -0,0 +1,476 @@ +Title: 03. (LibGDX) Game of Codes: Input & Movement 2.0 +Date: 2013-12-19 13:12 +Category: Game of Codes +Tags: Guides +Slug: 03-libgdx-game-of-codes-input-movement-2-0 +Status: published + +Welcome back to the Game of Codes, an introduction series to the LibGDX +framework. In the last edition we learned how to listen for keyboard +input, move things on the screen and do some basic game logic with +vectors. In this issue I want to re-touch that subject, but in a more +advanced manner. This time we'll have a look at InputProcessors and +their ability to listen for any kind of input, including mouse and +touchscreen gestures. If you haven't already worked through the last +issue of this tutorial series, you should do that +[now](http://www.spacekookie.de/02-libgdx-game-of-codes-input-movement/ "02. (LibGDX) Game of Codes: Input & Movement")! +I'll wait here. + +Oh, you stayed. Well then, let's get started. + + + +First of all we'll want to create a new class that extends the +InputAdapter. + +``` {.lang:java .decode:true} +package de.spacekookie.libgdxtutorial; + +import com.badlogic.gdx.InputAdapter; + +public class InputHandler extends InputAdapter { + +} +``` + +You can name yours whatever you want, I chose InputHandler, as for any +managing class that HANDLES things in my software :) Handlers and +Dealers, the criminal underworld in my source code is real. + +We will add things to this class later, first of all we should tell our +game that it exists. And we can do that by adding the following code +into the games creation method. + + + +``` {.lang:java .decode:true} + private InputHandler handler; + + @Override + public void create() { + + . . . + + handler = new InputHandler(); + Gdx.input.setInputProcessor(handler); + + . . . + } +``` + +Great. Now that we told our game to actually use the InputAdapter we +created we can start and add some actual code to it. If you look at the +class that we're extending you can see a few methods that we can +override. Why don't you add this method to the InputAdapter class. + +``` {.lang:java .decode:true} + @Override + public boolean keyDown(int keycode) { + return true; + } +``` + +Remember when I told you in the last post that polling +Gdx.input.isKeyPressed(. . .); was only an indirect way to get the +status of a key and would only react to a listener event? Well guess +what...that's an event listener that will react t ANY key-down event. +The keycode passed into the listener specifies the key in question. + +Go ahead and check if keycode is the same as the integer representing a +key (Keys.\*) like SPACE. + +``` {.lang:java .decode:true} +if (keycode == Keys.SPACE) { + System.out.println("If this game had gravity I would want to JUMP!"); +} +``` + +If you compile this you'll see that the game will of course still +recognize the inputs handled in the Games render() method but in +addition to that will react to keystrokes being handled in our +InputAdapter. However...we have a problem. To actually handle the input +in the Adapter we need to pass on some information into it. We can +either pass the Sprite along but I would say something much better is to +create a custom Object to hold all the important information to render, +move and manipulate the ship (or other entities we might add later). So +why don't you go ahead and create a new class called "Entity". I went +ahead and added some code to it to actually make it useful. + +``` {.lang:java .decode:true} +package de.spacekookie.libgdxtutorial; + +import java.util.Random; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.Sprite; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import com.badlogic.gdx.graphics.g2d.TextureRegion; +import com.badlogic.gdx.math.Vector2; + +public class Entity { + + public static enum EntityType { + PLAYER, ENEMY; + } + + public static enum ShipState { + IDLE, MOVING, DEAD; + } + + private EntityType type; + private Sprite self; + private TextureRegion shipIdle, shipFly1, shipFly2; + + private Vector2 moveVector = new Vector2(0f, 1f); + private float speed = 5f; + + public Entity(EntityType type) { + this.type = type; + moveVector.scl(speed); + loadResources(); + } + + public void loadResources() { + if (type.equals(EntityType.PLAYER)) { + shipIdle = new TextureRegion(new Texture( + Gdx.files.internal("USS_Pixel/ship_idle.png")), 0, 0, 64, + 64); + shipFly1 = new TextureRegion(new Texture( + Gdx.files.internal("USS_Pixel/ship_fly1.png")), 0, 0, 64, + 64); + shipFly2 = new TextureRegion(new Texture( + Gdx.files.internal("USS_Pixel/ship_fly2.png")), 0, 0, 64, + 64); + + self = new Sprite(shipIdle); + } + } + + public void idle() { + self.setRegion(shipIdle); + } + + public void fly() { + int i = new Random().nextInt(2); + if (i == 0) + self.setRegion(shipIdle); + else if (i == 1) + self.setRegion(shipFly1); + else if (i == 2) + self.setRegion(shipFly2); + } + + /** Used to get access to methods */ + public Sprite getSelfSprite() { + return self; + } + + public Vector2 getMovement() { + return moveVector; + } + + public void setMovement(Vector2 moveVector) { + this.moveVector = moveVector; + } + + /** Will be called in the @render() method */ + public void draw(SpriteBatch batch) { + self.draw(batch); + } + +} +``` + +If you actually look at the code you won't see anything you haven't seen +before. What I did was move all the texture loading, sprite setup and +region swapping when flying and idling into this class as well as +creating a few getters to access the information from outside the class. + +The only two new things are the two enums, ShipState and EntityType +which will become more useful in the future. But laying the groundwork +now for a more complex game will become handy later. + +Next up we need to take a look at the InputAdapter and change it in a +way that it uses flags on keyDown and keyUp (as in setting a flat to +"true" on down and "false" to up). Then move all the movement logic into +a method called "update()" that will be called in the games render() +method. + +Here is my code as reference. + +``` {.lang:java .decode:true} +package de.spacekookie.libgdxtutorial; + +import com.badlogic.gdx.Input.Keys; +import com.badlogic.gdx.InputAdapter; +import com.badlogic.gdx.math.Vector2; + +public class InputHandler extends InputAdapter { + + private Entity entity; + private boolean moving, clock, counterClock; + + public InputHandler(Entity entity) { + this.entity = entity; + } + + @Override + public boolean keyDown(int keycode) { + if (keycode == Keys.W) { + moving = true; + } + if (keycode == Keys.A) { + counterClock = true; + } + if (keycode == Keys.D) { + clock = true; + } + return true; + } + + @Override + public boolean keyUp(int keycode) { + if (keycode == Keys.W) { + moving = false; + } + if (keycode == Keys.A) { + counterClock = false; + } + if (keycode == Keys.D) { + clock = false; + } + return true; + } + + public void update() { + if (moving) { + Vector2 temp = new Vector2(entity.getSelfSprite().getX(), entity + .getSelfSprite().getY()); + temp.add(entity.getMovement()); + entity.getSelfSprite().setPosition(temp.x, temp.y); + + entity.fly(); + } else { + entity.idle(); + } + if (counterClock) { + entity.getMovement().rotate(5f); + entity.getSelfSprite().rotate(5f); + } + if (clock) { + entity.getMovement().rotate(-5f); + entity.getSelfSprite().rotate(-5f); + } + } +} +``` + +And the games render() method. + +``` {.lang:java .decode:true} + @Override + public void render() { + Gdx.gl.glClearColor(1, 1, 1, 1); + Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT); + + handler.update(); + + batch.setProjectionMatrix(camera.combined); + batch.begin(); + space.draw(batch); + player.draw(batch); + batch.end(); + } +``` + +Make sure to remove all calls from the main game class that we have +already moved to our Entity. And that's it. Compile this and see what we +made (a huge mess, I know). + +So? Well done, we just remade what we already had, just in less +clustered and more shiny. But this isn't very impressive, is it now? +Sure this code looks much cleaner than before but InputAdapters are a +lot more powerful than that. Why don't you go ahead and add a new method +to our InputAdapter. + +``` {.lang:java .decode:true} + @Override + public boolean mouseMoved(int screenX, int screenY) { + System.out.println(screenX + " : " + screenY); + return false; + } +``` + +When you compile this you'll see the coordinates of your mouse output in +the console as you move the cursor over the game window. That's because +the listener is being called every time the mouse is moved and without +any further filtering it of course. Now it's gonna get rough, so put on +your thinking hats and try not to go mad. Because we'll have to go and +mock around with Vectors quite a bit and I will have to introduce you to +camera vectors already. I will only brush the subject here and retouch +it in a later version to go more in depth. + +First up we need to change a few things in our main game class. First, +change the OrthographicCamera variable to "static". + +``` {.lang:java .decode:true} +private static OrthographicCamera camera; +``` + +And then write a little getter for that camera variable that's also +static, so that we can access it without having to worry about a +constructor. + +``` {.lang:java .decode:true} + public static OrthographicCamera getCameraInstance() { + return camera; + } +``` + + + +Now, go ahead and create three more global variables in the +InputAdapter. + +``` {.lang:java .decode:true} + private boolean clicked; + private Vector3 vec; + private Vector3 target; +``` + +The boolean will be used to flag whether the mouse button has been +clicked and the ship is still en-route. The two 3D vectors will be used +to pinpoint the target we're trying to approach and the movement vector +that the ship will be using. They need to be Vector3 objects (3D +vectors) because they need to interact with our camera, which is a 3D +object. Don't forget! LibGDX is a 3D game development framework, so we +need to ignore the third dimension most of the time. Just set it to "0"! + +Now we need to handle the mouse actions. Go and delete that line of code +from the mouseMoved method and create a touchDown() method. It will be +used to register mouse events but can also be used to register touches +on Android devices. + +``` {.lang:java .decode:true} + @Override + public boolean touchDown(int x, int y, int pointer, int button) { + if (pointer == 0) { + if (button == 0) { + + } + } + return false; + } +``` + +The pointer is "0" in case of the mouse but can be something else, when +we're dealing with touchscreen input. The button "0" is the left mouse +button, "1" is the right one. Nest those two if-statements, so that both +need to be true for our code to be executed. I will go through what we +do here line by line because it's not exactly trivial. + +``` {.lang:java .decode:true} +vec = new Vector3(x, y, 0); +``` + +First we take that Vector3 (vec) we created before and put some +information into it. X and Y are the mouse coordinates that are passed +into the listener (where the click occurred) and put 0 for the +Z-Coordinate. + +``` {.lang:java .decode:true} +TutorialLauncher.getCameraInstance().unproject(vec); +``` + +Next up, we need to call that static method we created in our main game +class to get the camera and call "unproject" onto it. Unprojecting means +associating a coordinate in the camera space with a pixel coordinate on +the screen. When the camera is moving around it will change the +coordinates quite drastically. So a camera coordinate (5000, 10000) +could still correlate to a pixel coordinate that's more like (255, 128), +etc. Unprojecting the camera and passing our Vector3 object into it +aligns the camera space with the pixel space on-screen. We WILL talk +about cameras and matrix projection in a later issue. For now, I hope +that this is at least somewhat clear. + +Next up, store the unprojected vector in our target Vector3 that we +created, set the boolean and return from the method. + +``` {.lang:java .decode:true} +target = new Vector3(vec); +clicked = true; +return true; +``` + +The target Vector3 will not change and serve as a reference where the +original click was made and when we want our ship to stop flying. We're +almost done. We already flag our button clicks in the listener, now we +just need to use that flag in our update() method that gets called every +frame. + +``` {.lang:java .decode:true} + if (clicked) { + entity.fly(); + } else { + entity.idle(); + } +``` + +You should understand what that does, just registering the clicked flag +and setting the textures accordingly. + +``` {.lang:java .decode:true} + Vector2 temp = new Vector2(entity.getSelfSprite().getX(), + entity.getSelfSprite().getY()); +``` + +Log the current position of our sprite and save it in the temp Vector. +And now it's getting kinda tricky. There is a Vector method called lerp, +which interpolated two vectors. We will touch Vectors again in a later +issue. If you want to read the mathematical principles of interpolation +you can click [here](http://en.wikipedia.org/wiki/Linear_interpolation). +(If you're masochistic like that). + +``` {.lang:java .decode:true} + temp.lerp(new Vector2(vec.x, vec.y), 0.1f); + entity.getSelfSprite().setPosition(temp.x, temp.y); +``` + +Vec starts as the target and gets shorter and shorter as the temp vector +approaches the target more and more. Afterwards we do the normal jazz +and adjust the entities Sprite position with the new temp vector (which +isn't the target position but rather the first step on the way to the +target. + +Lastly we need to deactivate the ships engines when the ship has reached +the target position (that's why we saved it in the target vector :) ) + +``` {.lang:java .decode:true} + if (target.dst(temp.x, temp.y, 0) < 2) + clicked = false; +``` + +Add this to the end of the if(clicked)-statement. dst(. . .) returns the +range between two vectors (target and temp, where we only look at the X +and Y coordinates) and we can then compare that range to a number, in my +case 2. So when the temp vector gets into a range of 2 pixels to the +target vector the if-statement is true and sets the clicked boolean to +"false" and stops moving the ship (and then the else-statement is called +and sets the texture to idle again). It also corrects the rotation +correction that we used before. + + + +And that's that. Compile the game and try out the two methods of +movement we now have. Rotating the ship properly when clicking would be +too long and difficult for this tutorial so I left it out. (Well +actually rotating isn't too difficult but making the click-rotation and +the keyboard rotation compatible is a bit tricky). + +What we did in this issue was refactor our input handling and add some +more code to interact with the game using the mouse. I don't know what +we'll touch on next but I think we'll end this issue here. I hope you +learned something and until next time, keep coding! + + diff --git a/teaching/gameofcode/04-libgdx-game-of-codes-textures-and-asset-management.md b/teaching/gameofcode/04-libgdx-game-of-codes-textures-and-asset-management.md new file mode 100755 index 0000000..08248ab --- /dev/null +++ b/teaching/gameofcode/04-libgdx-game-of-codes-textures-and-asset-management.md @@ -0,0 +1,216 @@ +Title: 04. (LibGDX) Game of Codes: Textures and asset management +Date: 2013-12-19 19:18 +Category: Game of Codes +Tags: Guides +Slug: 04-libgdx-game-of-codes-textures-and-asset-management +Status: published + +Welcome back to the Game of Codes, an introduction series to the LibGDX +framework. In the last edition we learned how to use InputAdapters and +used the keyboard and mouse to order our little space-ship around on the +screen. In this issue I want to take a step back from our actual game +and have a look at our surroundings. Data files, assets and resource +imports. Where to put them to make the game code as practical and +readable as possible. LibGDX has a few quirks and also tools to make +asset management as easy as it can be. So without further ado, let's +begin. + +Collecting all Asset imports in one class {style="text-align: justify;"} +----------------------------------------- + +The first thing we'll want to do is create a new package in our project. +I named mine "Util" to symbolize that everything in there has to do with +utility classes and tools that don't have a direct effect on gameplay +but are substantially important in using the game. If you're not +familiar with naming conventions for packages here is the rundown. + +``` {.lang:java .decode:true} +SUFFIX.DOMAIN.PROJECT.PACKAGE.SUB-PACKAGE + +In my case: + +de.spacekookie.libgdxtutorial.util +``` + +If you don't have website where you would publish your code just use +your name with a com or de or whatever your language code is (or you +want it to be to confuse people). + + + +Be sure to select your source folder to create the package. And then in +the next dialogue type the entire package tree, not just the name of the +end package you want to name. Because Eclipse will create folders from +these sub-trees. + +[](http://www.spacekookie.de/wp-content/uploads/2013/12/Screen-Shot-2013-12-19-at-15.19.16.png)And +to not confuse us in the long run r-click on that other package that so +far holds all other classes and add the subpackage-name "core" to it. It +will symbolize that it holds our darkest secrets (aka the most important +classes in our game, like the main game class or the InputAdapter). + +When you're done with that go ahead and create a new class in the "util" +package named along the lines of "ResourceLoader" or "TextureLoader" or +whatever takes your fancy. I'm gonna call it "**ResPack**" short for +"ResourcePacker", because it will be filled with static variables that +we will have to call from all over the game...LOTS of times. So I want +it to be as short as it can be. Once created go and fill it up with our +texture loading and save them into "public static final" variables. We +wan them to be accessible from anywhere in the game "public static" but +we also want them to be fixed and never changed again (by accident or by +an evil hacker that uses texture hacks) aka "final". + +``` {.lang:java .decode:true} +package de.spacekookie.libgdxtutorial.util; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.TextureRegion; + +/** Class to load all assets for the game */ +public class ResPack { + + public static final TextureRegion shipIdle = new TextureRegion(new Texture( + Gdx.files.internal("USS_Pixel/ship_idle.png")), 0, 0, 64, 64); + + public static final TextureRegion shipFly1 = new TextureRegion(new Texture( + Gdx.files.internal("USS_Pixel/ship_fly1.png")), 0, 0, 64, 64); + + public static final TextureRegion shipFly2 = new TextureRegion(new Texture( + Gdx.files.internal("USS_Pixel/ship_fly2.png")), 0, 0, 64, 64); +} +``` + +Alright, that's that so far. In addition to that I've made a little +texture called "blast\_small" that we will be adding later, which is +essentially just a little laser shot. You can download it +[here](http://www.spacekookie.de/downloads/Tutorials/LibGDX1/blast_small.png) +and add it to your USS\_Pixel folder in the assets directory. + +But you can already see a problem, the texture isn't in power of two +measurements and we would have to manually cut out the blast from a, say +32x32 texture. But we don't really want that, do we? We're gonna have a +lot more textures later on and if we have to cut out each one +individually we're gonna have a hard time. And that's why we have such a +handy thing called the +[TextureAtlas](http://en.wikipedia.org/wiki/Texture_atlas). + +Working with TextureAtli {style="text-align: justify;"} +------------------------ + +A TextureAtlas is essentially a file that contains all resources in it +packed into one image and an .atlas file that keeps tabs on what +resource can be found at what exact pixel location (and it's size, etc). +To create a TextureAtlas we need a TexturePacker which isn't included in +its GUI form in the LibGDX distribution (we can learn how to use the +command-line class from within our game later). Go +[here](https://code.google.com/p/libgdx-texturepacker-gui/downloads/list) +to download the GUI and add it somewhere in your project folder, why not +inside the asset folder. + +The texturepacker is a .jar that can be run as a UI application that +needs no setting up. Run it and get a look around. First we want to +create a new pack, so do that on the top-left corner of the window. +Select a project name, an input, an output directory and of course a +file-name pattern. Input is the USS\_Pixel folder in our assets folder, +the output is the assets folder itself (in my case). Leave all the other +settings as they are. Then select "Pack 'em all" and wait for a +confirmation to pop up. + + + +Go and check the output folder where you should see a .png and an .atlas +file. If you have a look at the .png you will see that all the single +textures we had in our USS\_Pixel directory have been molded into a +single file that has the power-of-two resolution so that our game won't +die on us. The .atlas file should just be a bunch of numbers and words +with parameters. We'll have a look at those in a minute. First I want +you to update Eclipse so that it sees the new files in our asset folder +and direct your attention back at the ResPack class that we started in +the beginning of this tutorial. + +We'll want to create a TextureAtlas object, private, static and final +and give it the .atlas file to read. I will call mine "\_PIXEL" + +*(It's my naming convention to give variables that are only used in very +very (VERY) specific context an underscore as a beginning so that they +show up first on the list of recommended variables but also to filter +them out quickly and give them somewhat of a specific look. You don't +have to do it this way, I think it's even considered bad practise. But +it's something that I like to do).* + +After we have our private static and final TextureAtlas we can find +textures in it by calling "findRegion(. . .)" on it. Here is some code +as reference. + +``` {.lang:java .decode:true} + private static final TextureAtlas _PIXEL = new TextureAtlas( + Gdx.files.internal("USS_Pixel.atlas")); + + public static final TextureRegion shipIdle = _PIXEL + .findRegion("ship_idle"); +``` + +As you can see we no longer have to bother around with pixel coordinates +in our textures because they've all be stored in the .atlas file by the +TexturePacker. All there is left to do now is remove the TextureRegion +calls from our Entity class and change it the fly() and idle() methods +as well. + +``` {.lang:java .decode:true} + public void loadResources() { + if (type.equals(EntityType.PLAYER)) { + + self = new Sprite(ResPack.SHIP_IDLE); + } + } + + public void idle() { + self.setRegion(ResPack.SHIP_IDLE); + } + + public void fly() { + int i = new Random().nextInt(2); + if (i == 0) + self.setRegion(ResPack.SHIP_IDLE); + else if (i == 1) + self.setRegion(ResPack.SHIP_FLY1); + else if (i == 2) + self.setRegion(ResPack.SHIP_FLY2); + } +``` + +And that's that. Isn't it neat? We cleaned up our code and even made the +loading of textures easier and more efficient as well. The only downside +is that you will have to re-pack your TextureAtlas for every texture +that you add. In practise I usually have 2-3 atli that hold different +kinds of textures together to keep some orientation over the textures +involved. + +For that purpose I created three more textures, the Deep\_Pixel\_Nine, +the Pixel\_Sun and Pixel\_Earth to be part of an "environment" atlas (as +well as a more low-profile space picture :p ). You can download the +whole .zip file with everything inside +[here](http://www.spacekookie.de/downloads/Tutorials/LibGDX1/world.zip)! +Go and add that to the ResPacker. You should know how ;) + +After setting up your ResPacker to properly import all the +TextureRegions you should go and change the image that we're currently +using and clean up your code in a way that it won't crash and doesn't +contain calls that aren't being used anymore. With the ResPacker you +have all your resources in one place and collected in two Texture Atli. + +Lastly, I went ahead and refactored the assets folder a little to be +less clustered and deleted some of the files that we didn't need any +more. Also note that I'm always keeping the raw files in case I need to +update something. + + + +And that's that for our rather short issue this time (I would want to +say this week but I'm writing these so quickly right now). Next time I +want to have a look at...I'm not sure yet. Probably cameras, controlling +cameras, moving cameras around, etc. And of course some lovely camera +theory. But until then have a lovely day and keep coding! diff --git a/teaching/gameofcode/05-libgdx-game-of-codes-cameras-their-controllers-and-more-input.md b/teaching/gameofcode/05-libgdx-game-of-codes-cameras-their-controllers-and-more-input.md new file mode 100755 index 0000000..d52c107 --- /dev/null +++ b/teaching/gameofcode/05-libgdx-game-of-codes-cameras-their-controllers-and-more-input.md @@ -0,0 +1,455 @@ +Title: 05. (LibGDX) Game of Codes: Cameras, their controllers and more Input +Date: 2013-12-20 02:21 +Category: Game of Codes +Tags: Guides +Slug: 05-libgdx-game-of-codes-cameras-their-controllers-and-more-input +Status: published + +Welcome back to the Game of Codes, an introduction series to the LibGDX +framework. In the last edition we learned how to use Texture Atli and +sort our assets in a way that we don't get lost in them (and also import +them all in one place, our ResourcePacker). In this issue I promised you +something about cameras and I realised that this would be the perfect +opportunity to add some more action into our game. Let's begin! + +The first thing we'll want to do is create a new class in our utility +package and call it something along the lines of CameraController, +CameraInputAdapter or CameraManager. Let the class extend the +InputAdapter and already create a few variables in it. An +OrthgraphicCamera called camera and 4 Vector3 objects called current, +mouse, last and delta. We'll need these to handle the scrolling logic +for our camera. + +``` {.lang:java .decode:true} +public class CameraController extends InputAdapter { + final OrthographicCamera camera; + + private final Vector3 current = new Vector3(); + private final Vector3 mouse = new Vector3(); + private final Vector3 delta = new Vector3(); + private final Vector3 last = new Vector3(-1, -1, -1); + +} +``` + +Be sure to give last three "-1" values and the rest you can leave empty. +That's that, now create a constructor that takes the camera and stores +it into the camera variable in our controller. + +Add the highlighted code into your games create() method to set up the +CameraController. **Notice how we replaced the InputAdapter as the Input +Processor and are now using the camController!!!** + +``` {.lang:java .mark:3-4 .decode:true} + camera = new OrthographicCamera(); + camera.setToOrtho(false, w, h); + camController = new CameraController(camera); + Gdx.input.setInputProcessor(camController); + camera.update(); +``` + +And that's where we'll take a step back and look at cameras for a +moment. I already mentioned "unprojecting" in a previous tutorial and +the term "Orthographic" has been flying around quite a lot recently. So +I actually wanted to take the time and explain a few things about +cameras because they'll make the whole ordeal less complicated (and also +give you the ability to come up with your own camera code). + + + +These are the two camera types, left perspective and right orthographic. +The main difference is that the perspective camera actively uses the +third dimension to create the effect of depth while orthographic cameras +will project everything onto the screen in a straight line. The third +dimension can be used to move things behind one another but there is no +effect of depth. Two objects could be apart by 500 pixels in the z-axis +and still have the same size on-screen. + + + +Camera projection is a bit tricky but it boils down to using two +different coordinate sets. When you draw something on the screen every +point in your window has a pixel coordinate from an origin (either top +left or top right corner). But when you're using a camera that camera +can scroll around, it can zoom and move. Therefor every point in the +camera space has a different coordinate than the pixel coordinates on +the screen. In the example of the picture above it is visible that the +point on the screen (in pink) has a different coordinate on the map than +on the screen (because the map and screen origin aren't the same). + +When registering clicks, drags or any kind of interaction all those +coordinates will be in the screen-coordinate system. But we don't want +the game to just set place in one screen width/ height so we move around +and by calling "unproject" with a Vector3 we can translate the screen +coordinates (with help of the camera) into world coordinates. Those two +can be the same if the origins are the same but they can also be vastly +different when on the other side of the game world. + +Don't forget to remember this! Your camera space will always move around +while your pixel space will stay the same. + +If you have questions about that, post them in the comments below. But I +hope this should be clear now. Now we should get back to the matter at +hand. + +Controlling the Camera {style="text-align: justify;"} +---------------------- + +We're gonna have a look at zooming the camera first and limiting zoom +range so that the player can't zoom out to see the entire world or zoom +too far in that one pixel of the ship takes up the entire screen. But +first up, I want you to do one things: go into the games Main method +(the one that starts the Desktop client) and change three things. + +``` {.lang:java .decode:true} + cfg.useGL20 = true; + cfg.width = 1280; + cfg.height = 720; +``` + +Using OpenGL2 isn't important for now but we should do it anyways. It +will make things look smoother and work faster but not be compatible +with older (Android) devices. The second thing is just upgrading the +game to 720p resolution which in 2013 is probably better. Aaaaaand JUST +like that we have the same resolution as the Xbox One :') + +``` {.lang:java .decode:true} + @Override + public boolean mouseMoved(int screenX, int screenY) { + mouse.set(screenX, screenY, 0); + return false; + } + + @Override + public boolean scrolled(int amount) { + float newZoom = camera.zoom * (1 + (amount < 0 ? 0.1f : -0.1f)); + changeZoom(newZoom, mouse.x, mouse.y); + return true; + } +``` + +Add these two methods to our camera controller. The mouseMoved method +should be fairly trivial, we only log the current mouse location into +our lovely vector, with the z-axis set to "0" and return with false. + +The second method is the scrolled(. . .) method that gets passed in an +amount (-1 or 1, depending on the mouse-wheel direction) and executes +some code to calculate the zoom. + +First up we create a new float called newZoom and take the current +camera zoom and multiply it by 1 + either 0.1 or -0.1, depending on +whether amount was 1 or -1. This is a general syntax that can be used, a +shortened if-statement: + +``` {.lang:java .decode:true} +(a < b ? 1 : 2) + +means: +"Is a smaller than b? If that's the case return 1, if not, return 2" +``` + +We could have written a whole nestation of if-statements for it but why +do that if we can just write one line. + +The next line calls "changeZoom" which is a method that we have yet to +implement and gives it the newZoom value, as well as the latest +mouse-pointer-coordinates. This means that the picture will zoom towards +the mouse, like in any decent game. If you wanted it to zoom towards the +center of the screen you could use this. + +``` {.lang:java .decode:true} +changeZoom(newZoom, Gdx.graphics.getWidth() / 2, Gdx.graphics.getHeight() / 2); +``` + +Now let's have a look at what we need to do in the changeZoom(. . .) +method we have yet to write. + +- We need to log the current screen position to translate the screen + by amount x and y to fit the new zoom position +- We need to check if zoom should be applied (aka if inside the zoom + boundaries) +- Apply the zoom, update the camera and check the new camera position +- Then calculate how to move the camera to its new position + +So there will be a tiny tiny delay between zooming and panning to a side +but in practise it's not noticeable. So let's get to work. + +First you should add another vector to the list, this time just a +Vector2, that will hold our zoom boundaries for us. I just went with two +hardcoded values that I found worked out quite well in practise. But +you're free to experiment around. + +``` {.lang:java .decode:true} + /* x = min, y = max */ + Vector2 zoomBounds = new Vector2(0.45f, 0.75f); +``` + +Next up, we can go create our method and tackle the first two bulletins +on our list. + +``` {.lang:java .decode:true} + public void changeZoom(float zoom, float x, float y) { + + Vector3 before = new Vector3(x, y, 0); + camera.unproject(before); + + if (zoom <= zoomBounds.x || zoom >= zoomBounds.y) { + return; + } + } +``` + +Returning from a void method with no value will just jump out of the +method. It's an easier why than to nest the entire algorithm into an if +or the following else-statement. The statement just checks if the zoom +value that we pass into the method. + +Now that we've shown that the zoom is valid we can apply it and update +the camera. Then we can store the new location vector, unproject it and +afterwards translate the camera from the old position to the new by +subtracting the two vectors and thus getting the connection vector. + +``` {.lang:java .decode:true} + camera.zoom = zoom; + camera.update(); + Vector3 after = new Vector3(x, y, 0); + camera.unproject(after); + + camera.translate(before.x - after.x, before.y - after.y, 0); +``` + +Go ahead and try that for a bit. You'll see that the camera won't zoom +past our barriers which means that the player can be focused on their +ship and the environment at times and still zoom out a bit and get some +sort of overview. It was important to having implemented this first +because now we're gonna tackle the much harder subject of scrolling +around (by clicking and dragging) and also setting boundaries around the +map that limit the player from scrolling past our beautiful star map and +into the nothingness that is the white background colour :O + +Start by adding two more methods: touchDragged, touchUp and update(). + +``` {.lang:java .decode:true} + @Override + public boolean touchDragged(int x, int y, int pointer) { + camera.unproject(current.set(x, y, 0)); + return false; + } + + @Override + public boolean touchUp(int x, int y, int pointer, int button) { + return false; + } + + public void update() { + + } +``` + +And start by setting the current vector to the x and y values passed +into the method as they'll be updating the current vector. Then +unproject that bad girl to get the world coordinates of the actions. + +Next we want to check if we've already dragged. And that's why I wanted +you to give the last vector the value (-1,-1,-1) because this now allows +us to use this value as a flag. See, because we're only using 0 in the +z-dimention we can assume that if it's set to -1 it's one of our flags. +So go ahead and check if last is (-1,-1,-1) and if it is NOT! set the +delta vector to the last coordinates and unproject that as well. + +``` {.lang:java .decode:true} +if (!(last.x == -1 && last.y == -1 && last.z == -1)) { + camera.unproject(delta.set(last.x, last.y, 0)); + } +``` + +Afterwards add two more things: we want delta to be the difference +between the last point and our current point, so we need to subtract the +two. And lastly we want to apply that manipulated delta vector to the +camera so that it actually moves from our last position to the current +position (on the delta vector). (Full if-statement to prevent confusion, +I will add the full code again afterwards. This is really non-trivial). + +``` {.lang:java .decode:true} + if (!(last.x == -1 && last.y == -1 && last.z == -1)) { + camera.unproject(delta.set(last.x, last.y, 0)); + delta.sub(current); + camera.position.add(delta.x, delta.y, 0); + } +``` + +After we're done with this we want the last vector to be set to our +current coordinates because in the next call those need to be updated +(as current will have been updated to our next position). Then we return +with false because we want the event to trickle through every listener +we have. What is that? I know...I'm getting ahead of myself, I will +explain that in a bit! + +Now we can scroll around the camera but there is one thing we need to do +and that is set last to (-1,-1,-1) again so that it can't activate the +if-statement on the first call of touchDragged and gets assigned with +the current coordinates. + +``` {.lang:java .decode:true} + @Override + public boolean touchUp(int x, int y, int pointer, int button) { + last.set(-1, -1, -1); + return false; + } +``` + +And here the full touchDragged(. . .) again as reference. + +``` {.lang:java .decode:true} + @Override + public boolean touchDragged(int x, int y, int pointer) { + camera.unproject(current.set(x, y, 0)); + + if (!(last.x == -1 && last.y == -1 && last.z == -1)) { + camera.unproject(delta.set(last.x, last.y, 0)); + delta.sub(current); + camera.position.add(delta.x, delta.y, 0); + } + last.set(x, y, 0); + return false; + } +``` + +Now...if you try this out you'll see that we can zoom and scroll around +on our lovely landscape. But the problem is that there are no bounds to +keep us inside the landscape and the player can easily scroll too far +and see the white background. Yikes. + +To fix this we need to go back to our main game class for a second and +change the render() method a tiny bit. + +``` {.lang:java .mark:6-7 .decode:true} + @Override + public void render() { + Gdx.gl.glClearColor(1, 1, 1, 1); + Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT); + + handler.update(); + camController.update(); + + batch.setProjectionMatrix(camera.combined); + batch.begin(); + space.draw(batch); + player.draw(batch); + batch.end(); + } +``` + +What did I do here? I stopped updating the camera in the render method +but instead started calling that update() method we created in the +CameraController. We could of course have this code in the render method +but it's good practise to not cluster that thing up too much. Go back to +the camera controller and add that camera.update() call to the update() +method again so that we don't break everything. + +And that's the point where I will once again bore you with mathematical +theorems. (Actually it's not too bad). The subject at hand is clamping. +For everybody familiar with this, go ahead and skip this paragraph. For +everybody that is not, let me quote Wikipedia for you: + +*"In computer graphics, clamping is the process of limiting a position +to an area. Unlike wrapping, clamping merely moves the point to the +nearest available value."* + +So essentially we have a method called clamp(value, min, max); and the +method tries to keep our value between the minimum and the maximum. In +LibGDX this is done by calling the MathUtils class and asking for (the +drunken) clamp. + +We will be clamping the cameras x and y position manually but we have +another problem. See...we have our origin in the bottom left, but the +camera position is measured at its center. And because we're zooming in +and out the center doesn't always have the same position. So we need to +adjust the boundaries for the camera dynamically. And we can do that by +taking the size of the screen, multiplying it with the camera zoom and +then dividing it by 2 to get the center. + +In code example. + +``` {.lang:java .decode:true} +camera.position.x = MathUtils.clamp(camera.position.x, (Gdx.graphics.getWidth() * camera.zoom) / 2, max); +``` + +Now..for the maximum, we want the camera to stop on the other side of +the texture, so we need to get the size of the texture from the +ResPacker. But we also need to take the same offset we added to the +minimum, because the center is still moved to its center. So instead of +adding to "0" we now subtract from the size of the texture. + +``` {.lang:java .decode:true} +ResPack.WORLD_BACKGROUND.getRegionWidth() - (Gdx.graphics.getWidth() * camera.zoom) / 2 +``` + +And that's that. Here is the full code if you wanna check that you did +it right. Of course we want to do this for both the X and the Y axis and +we of course want to take the HEIGHT for the Y axis, not the width +(looks at self in shame after not having found a bug with this). + +``` {.lang:java .decode:true} + public void update() { + camera.position.x = MathUtils.clamp(camera.position.x, (Gdx.graphics.getWidth() * camera.zoom) / 2, + ResPack.WORLD_BACKGROUND.getRegionWidth() - (Gdx.graphics.getWidth() * camera.zoom) / 2); + camera.position.y = MathUtils.clamp(camera.position.y, (Gdx.graphics.getHeight() * camera.zoom) / 2, + ResPack.WORLD_BACKGROUND.getRegionHeight() - (Gdx.graphics.getHeight() * camera.zoom) / 2); + camera.update(); + } +``` + +is now our update method and it's glorious, isn't it? Try it out and +marvel at our limitless glory and genius. And then realise that you can +no longer move the ship. Well....remember? We kinda replaced the +InputAdapter as our InputProcessor. But don't worry, there is a way +around it! Remember when I spoiled you a few lines ago with trickle down +something? Well..turns out that LibGDX offers you a way to add multiple +InputProcessors with something called a *Multiplexer*. + + + +Go into our main game class and add a new Object + +``` {.lang:java .decode:true} +private InputMultiplexer plex; +``` + +And then in the create() method. + +``` {.lang:java .mark:6,12-14 .decode:true} + @Override + public void create() { + + . . . + + plex = new InputMultiplexer(); + + handler = new InputHandler(player); + camController = new CameraController(camera); + + /* Input Controllers */ + plex.addProcessor(camController); + plex.addProcessor(handler); + Gdx.input.setInputProcessor(plex); + } +``` + +Adding the CameraController first will give it a higher priority in the +MultiPlexer. Meaning that it will first trigger the events in the +CameraController and then trickle down to the other controllers. That's +why I didn't want to return true in our drag-methods because that would +stop the event and not pass it onto the next InputProcessor. + +And that's that, compile this and you'll see that you can fly the ship +around and drag the camera over the map at the same time. And this is +where I'll end this tutorial, I think I've loaded your brain with enough +new stuff right now. + +Next time I want to take a look at actual gameplay. Letting the camera +pan after the ship, letting the ship also have boundaries (same as the +camera) and placing those other textures I made around in the world, as +well as some well needed refactoring if we're gonna expand our feature +list. But until next time, keep coding! diff --git a/teaching/gameofcode/06-libgdx-game-of-codes-creating-a-world-more-refactoring.md b/teaching/gameofcode/06-libgdx-game-of-codes-creating-a-world-more-refactoring.md new file mode 100755 index 0000000..3b44c52 --- /dev/null +++ b/teaching/gameofcode/06-libgdx-game-of-codes-creating-a-world-more-refactoring.md @@ -0,0 +1,333 @@ +Title: 06. (LibGDX) Game of Codes: Creating a world & more refactoring +Date: 2014-01-10 22:30 +Category: Game of Codes +Tags: Guides +Slug: 06-libgdx-game-of-codes-creating-a-world-more-refactoring +Status: published + +Welcome back to the Game of Codes, an introduction series to the LibGDX +framework. In the last edition we learned how to write a camera input +processor (which is really just like a normal input processor) and do +some freaky matrix calculations in order to move around. In this issue I +want to go back to the roots (so to say) and work on features. Our code +is already pretty slick but I think it can be improved in order to make +room for more features. Let’s begin! + +First off we should change a few things in our Entity class. Remember +that EntityType that I added despite you shaking your and saying "what +the hell is she up to again?" Well...go in there and add some more +values into the enum. And also create a public getter for the type and a +private setter. This is only a temporary solution, in the long run we +want things to be saved in a database. But it'll do for now! + +``` {.lang:java .decode:true} + public static enum EntityType { + PLAYER, ENEMY, STATION, PLANET, STAR; + } + + . . . + + public EntityType getType() { + return type; + } + + private void setType(EntityType type) { + this.type = type; + } +``` + +Right now we only have one station, one planet and one star. So if we +ever decide to create more bodies we'll have to come up with a new +system (Plot twists: I already have, I'm just not telling you ;) ) + +Next up we want to do something else. Go ahead and create a new package +called objects (Remember to name it with the full package-tree so that +it's a child of "libgdxtutorial" and not "src") We'll use this package +to store all our gameplay objects in here. Go ahead and drag the +"Entity" into it as well before creating a new class called "World". + +This is what your project tree should look now. Well...more or less. + + + +Our world class will have an overview of all entities in existence, +coordinate collision detection with the player (later maybe between +non-player entities as well) and generally just know everything +important. For that to work we need to give it all the entities there +are. So go ahead and create a new Set and a few methods to actually use +those. My code, as always, as reference below. + +``` {.lang:java .decode:true} +package de.spacekookie.libgdxtutorial.objects; + +import java.util.HashSet; +import java.util.Set; + +import com.badlogic.gdx.Gdx; + +public class World { + + private Set entities; + + public World() { + entities = new HashSet(); + } + + public Set getEntities() { + return entities; + } + + public Entity getEntitityWithType(Entity.EntityType type) { + for (Entity e : entities) { + if(e.getType() == type) + return e; + } + return null; + } + + public void addEntity(Entity e) { + if (!entities.contains(e)) + entities.add(e); + else + Gdx.app.log("World", "Entity already in Set!"); + } + + public void removeEntitity(Entity e) { + if (entities.contains(e)) + entities.remove(e); + else + Gdx.app.log("World", "Error! No such entity in world!"); + } +} +``` + +The constructor just initializes the HashSet, we have a few getters and +setters, a way to individually add a single entity (e.g. if we're +spawning a pirate ship, maybe?) We'll be expanding on this code heavily +in the future but it's as complex as it needs to be right now. (Note how +I'm using Gdx.app.log to log two cases when adding and removing +entities. That's not required but it's a good way to keep tabs of +potential errors when playing the game or debugging something.) + +Next, we should go into our main game class and start using the World +object. Make sure to actually use OUR world object, not the Box2D world +(which is great for physics and lighting and we might use it later but +not right now!) + +``` {.lang:java .decode:true} + world = new World(); + world.addEntity(new Entity(EntityType.PLAYER, new Vector2(200, 150))); +``` + +And we of course need to teach our InputProcessor to use the world to +handle input! + +``` {.lang:java .decode:true} + handler = new InputHandler(world); +``` + +And in the InputHandler we need to change the constructor and some +methods. + +``` {.lang:java .decode:true title="Constructor"} + public InputHandler(Object o) { + + if (o instanceof World && o != null) + this.world = (World) o; + + if (o instanceof Entity && o != null) { + this.e = (Entity) o; + return; + } + + for (Entity e : world.getEntities()) { + if (e.getType() == EntityType.PLAYER) { + this.e = e; + } + else { + Gdx.app.log("InputHandler", "NO PLAYER IN WORLD!"); + } + } + } +``` + +(Be sure to rename the entity in that class to "e") + +And that should be all the changes we need to make. If I missed anything +or something is unclear, just leave me a comment below and I'll get back +to you. If you compile this it should still be the same game as before, +with the difference that under the hood it has a lot more horsepower +(kilowatts) and we'll be able to do some really cool things with this in +a moment. + +Here is an idea. Why don't we go ahead and plan our solar system a +little. I know, I know, you're lazy again. I get it. You just wanna read +these, absorb the knowledge via a USB3 port in your skull and eat +Cheerios all night. Still. I hope you can be bothered to check out the +picture below :) + + + +You can see the background image that is currently our game world and +our other objects scattered around the world. The grid lines in +Photoshop (Adjustable under Preferences --\> Guides, Grids & +Sliders --\> Grid) will give us a little help when trying to find places +to place these objects. But for that to happen we need to add a little +more to our Entity class. + +See, right now we just check if the EntityType is the player and if it +is we draw the space ship. But what we really want to do is also take a +set of coordinates in the constructor to pass down to the rendering. In +fact, we kinda want the pixel coordinate to be saved in the object +itself rather than having to check the sprite for information. Because +that's what the object is for, to hold all the information needed and +provide a sort of "interface" to access and store the information. We +don't want to be digging around in a sub-object or OpenGL logic object +to get information. + +So I added a new vector called position, created a new constructor that +now also takes a vector (left the old one to not break things) and +created a method called "updatePosition()" that takes the position +vector and gives the coordinates to the sprite. + +``` {.lang:java .decode:true} + private Vector2 position; + + public Entity(EntityType type) { + this.type = type; + moveVector.scl(speed); + position = new Vector2(); + } + + public Entity(EntityType type, Vector2 position) { + this.type = type; + this.position = position; + moveVector.scl(speed); + updatePosition(); + } + + public void updatePosition() { + self.setPosition(position.x, position.y); + } + + . . . + + public Vector2 getPosition() { + return position; + } + + public void setPosition(Vector2 position) { + this.position = position; + } +``` + +Next up we want the loadResources method to be able to not just load the +ship textures but check all the EntityTypes and load textures +accordingly. For that I changed the whole thing to a Switch statement. +If you're not familiar with Switch...get familiar with +[Switch](http://docs.oracle.com/javase/tutorial/java/nutsandbolts/switch.html). +It's awesome! + +``` {.lang:java .decode:true} + public void loadResources() { + switch (type) { + case PLAYER: + self = new Sprite(ResPack.SHIP_IDLE); + break; + case PLANET: + self = new Sprite(ResPack.WORLD_EARTH); + self.setScale(2f); + break; + case STATION: + self = new Sprite(ResPack.WORLD_STATION1); + self.setScale(1.5f); + break; + case STAR: + self = new Sprite(ResPack.WORLD_SUN); + self.setScale(2f); + break; + + default: + Gdx.app.log("Entity", "EntityType not found!"); + break; + } + } +``` + +I added the "setScale" in order to simulate size. A star should +be \*slightly\* larger than a space station. This is only a temporary +measure but I think it'll look better this way. You can of course leave +it out. + +There is one thing we'll have to do to restore the game as it was before +and that is to actually use the "updatePosition" method that we created. +So in the input processor, instead of calling "setPosition" on the +sprite we should use our object methods. + +``` {.lang:java .decode:true} + if (moving) { + Vector2 temp = new Vector2(e.getPosition().x, e.getPosition().y); + temp.add(e.getMovement()); + e.setPosition(temp); + e.updatePosition(); + e.fly(); + } +``` + +So far so good. Our code can now handle different types of objects, +though we will still need to create the objects at some point. And +because we want the world to keep tabs on everything going on we'll have +to update some code in our world method. See, we can add entities by +calling that 2nd lovely constructor and passing them into our world +object. We do that by calling. + +``` {.lang:java .decode:true} +world.addEntity(new Entity(ENTITY_TYPE, ENTITY_POSITION)); +``` + +Where Type and Position are of course one of our lovely EntityTypes that +we defined and the position is a Vector2 object. And where will we use +this dark magic you ask? Well simple. Where do we already add the player +to our world. + +``` {.lang:java .mark:8-10 .decode:true} + @Override + public void create() { + float w = Gdx.graphics.getWidth(); + float h = Gdx.graphics.getHeight(); + + world = new World(); + world.addEntity(new Entity(EntityType.PLAYER, new Vector2(200, 150))); + world.addEntity(new Entity(EntityType.STATION, new Vector2(600, 300))); + world.addEntity(new Entity(EntityType.PLANET, new Vector2(1200, 600))); + world.addEntity(new Entity(EntityType.STAR, new Vector2(650, 750))); + } +``` + +In our main game create() method. Now render this and marvel at its +glory. You can of course change the coordinates. Note that those are +camera-world coordinates, not pixel-coordinates. Compile this, it +shouldn't throw any errors. (Unless I forget to mention something in the +post ;) + + + +And well...that's it for this time, really. I hope that you learned a +thing or two and have also seen that the BEST way of implementing a new +feature is often to take a step back, look at the big picture and then +think about how it would be easiest to do something. Next issue I want +to show you how to UI which is an important thing when it comes to +creating a game. Also note, that all of my source code can be viewed on +my open repository on +[BITBUCKET](https://bitbucket.org/LaGemiNi/star-chaser "BITBUCKET") (which +is the name I've given to this name). There is also a video on my +[youtube](http://www.youtube.com/watch?v=ocYqXyM9v2Y "youtube") channel +from a week ago or so. Go check both things out. + +Sorry that it took me a bit longer to get this one out. I had a lot on +my plate the last week. I'll try bring out two posts on here per week. I +have something slightly special planned for next Tuesday. Hint, it +involves a lot of hardware, FreeBSD and a RAID :) + +But until next time, keep coding! diff --git a/teaching/gameofcode/07-game-of-codes-user-interfaces-and-the-power-of-scene2d.md b/teaching/gameofcode/07-game-of-codes-user-interfaces-and-the-power-of-scene2d.md new file mode 100755 index 0000000..c3d76d0 --- /dev/null +++ b/teaching/gameofcode/07-game-of-codes-user-interfaces-and-the-power-of-scene2d.md @@ -0,0 +1,359 @@ +Title: 07. (LibGDX) Game of Codes: User Interfaces and the power of Scene2D +Date: 2014-01-14 21:31 +Category: Game of Codes +Tags: Guides +Slug: 07-game-of-codes-user-interfaces-and-the-power-of-scene2d +Status: published + +Welcome back to the Game of Codes, an introduction series to the LibGDX +framework. In the last edition we added new features to our game and +learned that the best step forward is often a step to the side (or back) +to get a view over what's going on. In this tutorial I want to show you +something that has absolutely nothing to do with features but will be +among the most important things in the game: the UI. We'll talk about +stages (like the acting stages, not rocket stages), UI elements and +something called Scene2D. Let's begin! + +Any game will be composed of several layers. In the background you want +to draw a map or textures to let the players know where they are +(relatively). In the actual scene you want to draw all sorts of objects +including the player themselves to show what's going on. And in the +foreground you want to draw the UI with which the player can interact to +manipulate the game. Sure, we already have our input listeners set up in +a way that we can manoeuvre around our ship. But what about a UI? +Buttons? An inventory? This is something we'll tackle in this tutorial. +It's gonna be a long one too so be sure to bring some time and maybe +re-read it at a later point again. + +In LibGDX we can use a UI-package called "Scene2D" which is perfect for +anything UI. It uses a layer of our game called the "Stage" that will be +populated by "Actors". In the beginning we'll stick with standard actors +but we can soon expand and write our own Actors by expanding that +superclass and doing own things with it. The stage will gladly welcome +our new Actor object into its ranks and manage everything there is to +manage about it. Just like our world-class. So you can see that it's +always a good idea to implement a managing parent class, followed by a +bunch of child objects. + + + +But before we get some stuff done with Scene2D and the stage I need to +explain you a few things about skins. A skin is a way to tell the game +how a UI should look. It includes fonts, graphics and textures to +describe how things have to be drawn. And creating beautiful skins is a +tutorial of its own (with which I'm honestly not very familiar. I'm a +programmer, not a designer ;) ). But luckily the creators of LibGDX +provide us with a standard skin that we can just download and use. It's +not exactly pretty and I wouldn't recommend using it in your games end +release. But it'll get the job done until then. And if you at a later +stage decide that you want to use your own skin, you will only have to +change the skin files and everything else remains the same. Pretty cool, +eh? + +------------------------------------------------------------------------ + +So first off we'll need some files that make up the skin: + +[A +FONT](https://github.com/libgdx/libgdx/blob/master/tests/gdx-tests-android/assets/data/default.fnt) + +[AND IT'S +RESOURCE](https://github.com/libgdx/libgdx/blob/master/tests/gdx-tests-android/assets/data/default.png) + +[A TEXTURE +FILE](https://github.com/libgdx/libgdx/blob/master/tests/gdx-tests-android/assets/data/uiskin.png) + +[AND IT'S +ATLAS](https://github.com/libgdx/libgdx/blob/master/tests/gdx-tests-android/assets/data/uiskin.atlas) + +[A JSON +FILE](https://github.com/libgdx/libgdx/blob/master/tests/gdx-tests-android/assets/data/uiskin.json) + +(To actually download the text-files just view their content in "Raw" +and copy them into a text editor of your choice. However use something +that let's you set your own file types. TextWrangler or TextMate on macs +and Notepad++ on Windows) + +------------------------------------------------------------------------ + +Download these from the LibGDX github repository. In general, if you're +ever stuck or want to look at some samplecode or just get to know what's +under the hood of the latest nightly build, check the github repository +for answers. It's a great tool! Put them all into a new folder in your +assets directory called "Skin" or something and then go into your +Resource packer class and create a new public final static object there. + +``` {.lang:java .decode:true} + public static final Skin _SKIN = new Skin(Gdx.files.internal("data/skin/uiskin.json")); +``` + +And that's that. LibGDX will do the rest. From now on, every time we +want to use anything related to the UI we will have to pass in this skin +to make it work (and look the same as the rest of the game). Now we'll +be doing some stuff in LibGDX's Scene2D. It's all very basic but +necessary to understand. Again...I might not cover everything. But if +you google "Scene2D + anything" you'll find your answers quite quickly. +90% of coding: googling how to do things :) + +Basics of Tables +---------------- + +We'll want to go into our main game class and create a new object called +"Stage". Make it private and initialize it just after the camera. And +then set the viewport in the resize method. Confused? Look below. + +``` {.lang:java .decode:true} + /** UI */ + private Stage stage; + + @Override + public void create() { + + . . . + + /** UI */ + stage = new Stage(); + + . . . + + } + . . . + + @Override + public void resize(int width, int height) { + stage.setViewport(width, height); + } +``` + +This way the stage will be resized every time we resize the viewport of +the game. Which currently is only at launch because we don't allow for +user resizes. But that could change. That's a pretty good idea, we +should actually do the same with our camera. So remove our two variables +"w" and "h" and move "camera.setToOrtho(...)" to the resize method so it +looks like this. + +``` {.lang:java .decode:true} + @Override + public void resize(int width, int height) { + stage.setViewport(width, height); + camera.setToOrtho(false, width, height); + } +``` + +Now...enough spontanious refactoring, let's actually get into our +tables. The stage itself is an invisible object, much like our world. It +won't draw anything unless we actually add some actors and then act out +the stage in our render method. + +Why don't we create a button that says "Menu" in the top-right corner? I +think that's a nice start to our UI and actually useful. In LibGDX there +are many button implementations, including some with pictures and an +abstract type that you can implement your own types on. But the regular +"TextButton" is sufficient for us at this time. So go create a global +variable of the type TextButton, give it a name and then, after +initializing the stage, initialize the button. How? Like this. + +``` {.lang:java .mark:1,10 .decode:true} + private TextButton menu; + + @Override + public void create() { + + . . . + + /** Setting up the UI */ + stage = new Stage(); + menu = new TextButton("Menu", ResPack._SKIN); + + . . . + } +``` + +You can see that the button wants a string to display on itself and of +course a skin. So far so good. But how do we tell it to go to the +top-right corner of the screen? Well...that's not so simple and I +actually want to show you this way first so you NEVER think about doing +this manually again :) We will need to take the size of the stage and +then substract the size of the button from it and set that as its new +position. + +``` {.lang:java .decode:true} + menu.setPosition(stage.getWidth() - menu.getWidth(), stage.getHeight() - menu.getHeight()); + stage.addActor(menu); +``` + +Pretty complicated, eh? That second line adds the menu-button to the +stage. It's essentially the same thing that we're doing with our world: +creating a bunch of objects and passing them into a large-scale manager. +But, if you remember correctly, our world needs something in the render +method to work. And the same applies to our stage. First we need to act +out the stage which means moving things that need to be moved, animating +things that need to be animated, etc. And then draw the stage. So in our +render method we add. + +``` {.lang:java .decode:true} + stage.act(); + stage.draw(); +``` + +Be sure to put this at the very bottom of our rendering so that it ends +up on TOP of our stack. (Laying a stack of papers, the sheet you put +onto it first will be on the bottom (the background) while the one you +put on last will be on top (the UI). + + + +Now compile this and marvel at its glory. Well...kind of. See...when we +now need to add a second button to that menu maybe titled "Inventory" +we'll have to do very complicated mathematics in order to line up the +buttons. Which isn't great and which is why Tables were created. + +Just after creating your button, why don't you go and create a "Table" +object, initialize it after the stage and then add the button to the +table and the table to the stage. + +``` {.lang:java .mark:1,10,12-13,16 .decode:true} + private Table buttons; + + @Override + public void create() { + + . . . + + /** Setting up the UI */ + stage = new Stage(); + buttons = new Table(ResPack._SKIN); + + buttons.setFillParent(true); + buttons.top().right(); + + menu = new TextButton("Menu", ResPack._SKIN); + buttons.add(menu); + + stage.addActor(buttons); +``` + +So instead of adding the button to the stage we add it to the table, we +tell it to fill its parent (which is important for the validation of the +table during render) and then call "top" and "right"...see, instead of +working with pixel coordinates here we can just tell the table to go to +any corner of the window (center, top, bottom, left, right). And the +coolest thing is that the table will try to stay on-screen, even if we +add more buttons. Let's do that now honestly, create a new button called +"Inventory" and add it to the table just as the menu button. Note that +the table will be populated from left to right meaning that if you want +the Inventory button to be to the left of the menu button you'll have to +add it first. + +And that's that for tables for now. There are more advanced things +concerning tables but I won't cover them here (and now). If you're +curious or this isn't specific enough for what you have planned, why +don't you go [here](https://github.com/EsotericSoftware/tablelayout) and +read about it :) + +Handling input +-------------- + +Something you might have noticed is that our current buttons don't react +to any kind of input. That has to do with the fact that we never +register the stage as an input processor. Usually you call +Gdx.input.setInputProcessor(stage) but as we already have an input +multiplexer set up we can just add the stage to that. + +``` {.lang:java .decode:true} + plex.addProcessor(stage); +``` + +And voila you'll see that the buttons now react to our clicks, even with +just a red glow. Because to actually HANDLE the input we need something +to listen to it. In our input processors we have listeners to certain +events, like moving the mouse or pressing a certain button. And we use +these events to manipulate our game. For the UI it's no different. +Well...it's slightly different. We don't want to create a UI +InputProcessor. It's not only completely ridiculously complicated but +actually inadvisable. Instead we'll set up the listeners for each button +manually in our game class and tuck them away in a method somewhere at +the bottom of the class to be out of sight and out of mind. + +``` {.lang:java .decode:true title="Clicklistener - innertype"} + private void setupListeners() { + menu.addListener(new ClickListener() { + + public void touchUp(InputEvent event, float x, float y, int pointer, int button) { + Gdx.app.log("Stage", "Menu button pressed"); + } + }); + } +``` + +What you see above is known as an inner-type. If you've worked with my +Android series before you'll know them. it's essentially a way to create +a class inside another class (in the parameter brackets of a method) to +define how a passed down to the "addListener" method. + +The ClickListener extends the InputListener where we can manually +override one of the listeners. In my case I decided to override the +"touchUp" method with all the parameters it takes and log the case. Now +create a second listener for the second button, just as the one I showed +you above. Compile it and see what happens. Pretty cool, eh (again)? + +Okay, maybe not that cool. Initially I wanted to go on here and make +options and inventory screens but I think we should do this at a later +time because it would take hours and not really have anything to do with +Scene2D anymore. Let's just check out some other elements we have in +Scene2D before wrapping this up. + +So create a new table with a name of your choosing and add a few thing +to it. + +``` {.lang:java .decode:true} + temp = new Table(ResPack._SKIN); + temp.setFillParent(true); + TextureRegionDrawable trd = new TextureRegionDrawable(new TextureRegion(new Texture( + Gdx.files.internal("graphics/image_button.png")))); + imageButton = new ImageButton(trd); + checkbox = new CheckBox("This is a checkbox", ResPack._SKIN); + field = new TextField("This is a textfield", ResPack._SKIN); + + temp.add(imageButton); + temp.row(); + temp.add(checkbox); + temp.add(field); + temp.top().left(); + stage.addActor(temp); +``` + +Oh boy, I know. Let's go trough it line by line. Temp is just a table +that we set to fillparent = true. The next thing we do isn't really +important for now, just note that we're doing it. A +TextureRegionDrawable extends a Drawable that we need for our button. +Ideally you want to have all your button images in your skin. But the +default skin doesn't. So because I didn't want to add stuff to the skin +I went with the "hard" but quick way. Afterwards we initiate a checkbox +and a textfield. + +[](http://www.spacekookie.de/wp-content/uploads/2014/01/image_button.png) + +Note how we're adding things to the table and using "row()" only once. +Each time you call row() it will create a new row. So in effect the +first item will be on it's own row and then the checkbox and textfield +on another. If you put another row between them that will change of +course. Above you have the button image that I used. Go import that into +your project if I want it to work OR of course just create your own +Button image. + +I hope that this tutorial has shown you how powerful Scene2D can be. +With just a few lines of code we created a whole layout and added +listeners to it. The process remains that easy and you ca of course +still add and subtract offsets to tables to fine-tune their position. If +you have further questions about Scene2D, go ahead and post them below. +But in general the API is relatively well documented and if you have +questions you can always check out the LibGDX forums or the IRC. + +Thats it for today, I'll continue with this next time but we'll have our +focus on something called Screens. They're nifty little things that can +make our life a whole lot easier (and more difficult actually ;) ). +I actually wanted to do something \*slightly\* different today (that +involved computer hardware) but I actually ordered a wrong part. So +that'll be delayed. Not sure when it'll come out. So until next time, +keep coding. diff --git a/teaching/gameofcode/08-libgdx-game-of-codes-screens-subscreens.md b/teaching/gameofcode/08-libgdx-game-of-codes-screens-subscreens.md new file mode 100755 index 0000000..de696a9 --- /dev/null +++ b/teaching/gameofcode/08-libgdx-game-of-codes-screens-subscreens.md @@ -0,0 +1,381 @@ +Title: 08. (LibGDX) Game of Codes: Screens & Subscreens +Date: 2014-01-19 09:30 +Category: Game of Codes +Tags: Guides +Slug: 08-libgdx-game-of-codes-screens-subscreens +Status: published + +Welcome back to the Game of Codes, an introduction series to the LibGDX +framework. In the last edition we looked at user interfaces with Stages +and Scene2D. Today I want to show you how to make your game a LOT better +and more functional by adding *Screens *(I already spoiled this last +tuesday ;) ). Let's begin! + +First of all we should take a step back and look at our game. We have +our main-game class that currently extends "ApplicationListener" and +does a whole lot of stuff. It's the main game loop, it populates and +updates the world and handles input. So essentially it's a class that is +tied into everything that LibGDX does to make a game runnable. Well...an +"Application". That's a very broad term and there is another subclass of +that main class that we currently extend, that we need to use in the +future. it's almost the same as the ApplicationListener but \*slightly\* +different. And we need that. The class is called "Game". So what I want +you to do now is go into the main "Game" class and change the extend +from "ApplicationListener" to "Game". In my case it's the line below. + +``` {.lang:java .decode:true} +public class StarChaser extends Game { +``` + +Eclipse might give you some trouble with implementing the new methods. +Usually you just have to clean your project (Project --\> Clean --\> +All) and it'll calm down. In the worst case scenario just copy all your +code into a different editor, delete all the code from the class (except +the class definition and package of course, let Eclipse import +everything for you again, implement the methods and then paste your code +into the methods it create (that will be EXACTLY the same as the ones we +had before. But you know...Eclipse is weird sometimes :) ). + +What did this get us? Well...if you added the sources to your Libraries +you can right-click that "extends Game" and show it's declaration to see +the Game class that we now extend. It extends the ApplicationListener +and adds something we want to use now: a *Screen!* + +A screen is a layer of our game. It gets shown, rendered, paused and +destroyed. It acts very much like a fragment on Android (if you're +familiar with the Android API) and can be an overlay or replacement of +the entire game. using screens is a much better solution in switching +between "screens" than creating new games or trying to use a lot of +booleans and flags to determine what part of which GUI is supposed to be +visible. + +So why don't you go and create a new package called "screens" and add a +new class to it and let it implement "Screen". I called mine +"MenuScreen". + +``` {.lang:java .decode:true} +package de.spacekookie.starchaser.screens; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.Screen; +import com.badlogic.gdx.scenes.scene2d.Stage; + +public class MenuScreen implements Screen { + + /** UI */ + private Stage stage; + + @Override + public void render(float delta) { + stage.act(); + stage.draw(); + } + + @Override + public void resize(int width, int height) { + stage.setViewport(width, height); + } + + @Override + public void show() { + stage = new Stage(); + } + + @Override + public void hide() { + + } + + @Override + public void pause() { + + } + + @Override + public void resume() { + + } + + @Override + public void dispose() { + + } + +} +``` + +This is what your class should look like (more or less). I took the +liberty of already adding a stage to it because we want to draw a menu +screen, something with buttons and text and the easiest way to do that +is with Scene2D (as we've learned in the last tutorial). + +Next up we'll want to populate that stage. I prepared something and am +just gonna paste it in here. You can arrange your buttons in whatever +order you want. I went for something very simple and centric. + +``` {.lang:java .mark:25 .decode:true} + @Override + public void show() { + stage = new Stage(); + + table = new Table(ResPack._SKIN); + + table.setFillParent(true); + table.center(); + + title = new Label("MAIN MENU", ResPack._SKIN); + title.setFontScale(2.5f); + + resume = new TextButton("RESUME GAME", ResPack._SKIN); + options = new TextButton("OPTIONS", ResPack._SKIN); + exit = new TextButton("RAGE QUIT", ResPack._SKIN); + + table.add(title).center().pad(25f); + table.row().height(75); + table.add(resume).center().width(500).pad(5f); + table.row().height(75); + table.add(options).center().width(500).pad(5f); + table.row().height(75); + table.add(exit).center().width(500).pad(5f); + stage.addActor(table); + Gdx.input.setInputProcessor(stage); + } +``` + +You should understand what I'm doing here and it's nothing more advanced +than what we did in the last tutorial. Except that I set a row height, +give buttons a specific size and add padding around them to make it look +more smooth. + +<span style="text-decoration: underline;">Note how we overwrite the +input processor from the main game to the stage. This means that the +game will be unresponsive, We'll have to change that back later!</span> + +So far so good. But what do we now actually do with this? We want to add +this screen to the main game class in a way that we don't have to create +new instances of it all the time. So go ahead and create a global +variable in the main game class and initialize it on create(). + +``` {.lang:java .decode:true} + /** Screens */ + private MenuScreen menuScreen; + + @Override + public void create() { + + . . . + + /** Setting up support screens */ + menuScreen = new MenuScreen(); + + . . . + } +``` + +And another global variable we'll have to create is "self" which has the +type of our main game class (which in my case is "StarChaser"). We can +do that by creating an object with the class name and initializing it +with the following. + +``` {.lang:java .decode:true} + private StarChaser self = this; +``` + +We will need this global variable in our click-listener, because +there the scope is different. See, while we can easily call "this" or +"super" in our main game class to access anything in the class or that +we inherit from, in the Clicklistener we're technically in a different +class (the ClickListener class) and thus we can't access things we +inherited outside of it. To circumvent this we add a global variable +that we can still see, access and Boya! + +In the ClickListener you can throw out the Log call and add this. + +``` {.lang:java .decode:true} +self.setScreen(menuScreen); +``` + +When you now compile this you'll see that you don't see anything. :) +Because we're not actually rendering the screen. For that to happen you +have to add this line of code to the bottom (the very end) of your +render() method (in the main game class that is). + +``` {.lang:java .decode:true} +super.render(); +``` + +This will ensure that if there is a screen visible that their +appropriate render method is being called at the right time (You can +look at the super-render() method when you look at the super-class. It's +sometimes interesting). + +Now compile this and see, that we have a neat overlay of our buttons +over the game. And we can no longer move our ship around and we're also +kinda stuck in that menu screen because we haven't set up any listeners +yet. Now...resetting the screen works in a very similar way: we take our +main game, call setScreen(null) on it and the screen will disappear. +However...we don't have that inheritance in our Screen object, do we? +No. So we'll have to pass it in via the constructor. + +So first we create a constructor in the MenuScreen class. + +``` {.lang:java .decode:true} + public MenuScreen(StarChaser self) { + this.parent = self; + } +``` + +And of course a global variable in the class called "parent" or +"cupcake" or whatever you want to store the information. Also make sure +to update the constructor call (in the ClickListener) from no parameters +to "self". + +With this new variable in our screen we can go ahead and create a new +Clicklistener for one of our lovely buttons. I only chose the "Resume" +one for now but we can add functionality to the other ones as we move +along with our game. + +``` {.lang:java .decode:true} + resume.addListener(new ClickListener() { + + public void touchUp(InputEvent event, float x, float y, int pointer, int button) { + parent.setupInput(); + parent.setScreen(null); + } + }); +``` + +You'll probably go "Woooah, easy there girl, what's that setInput()??" +and well...you're right. See, when we get back to our game and the +screen is hidden somewhere in memory we can't control the game anymore. +We haven't told our game yet that we want to resume using the input +Multiplexer so that we can actually control our ship again. + +For that to happen I created this public method that sets the input to +the Multiplexer and sets up the Stage-listeners (for our buttons). In +the main game simply call this method instead of the actual calls (so +after adding things to the Multiplexer). Because the InputAdapters still +exist in memory, we don't want to re-initialize them. That'd be a waste +of resources and memory. + +``` {.lang:java .mark:10,13-17 .decode:true} + @Override + public void create() { + + . . . + + /** Input Controllers */ + plex.addProcessor(stage); + plex.addProcessor(camController); + plex.addProcessor(handler); + this.setupInput(); + } + + public void setupInput() { + Gdx.input.setInputProcessor(plex); + this.setupListeners(); + } +``` + +And that's it. If you compile this you'll have a functional button that +takes you to the MenuScreen and back again when you press the +appropriate button. I hope you understand the logic behind this. We show +a screen, we use it, we hide it. Think of the screens like overlays that +you put over your main "game-layer". But just because we can +conveniently draw over our main layer that doesn't mean that we won't +have to change a few things, pass parameters along and manually reset +the input (as an example). LibGDX is a framework that allows for the +complicated stuff to be easy (the drawing a new screen over the current +game etc.). The rest is up to you, how you want to handle it, how you +want your game (or just application) to look. Below is a picture that +shows the current setup we have. + + + +Speaking of looks...I don't actually like how that menu screen is +looking. I'd much rather have it be semi-transparent in the background +so the game gets grayed out. Luckily that's easily possible. +Well...possible :) + +First you should create a Camera object in our MenuScreen and get the +camera from the main game in the constructor. (We already have a static +method called "getCameraInstance()" that we used a couple of issues back +for our input processor to do things. After that create a +"ShapeRenderer" and initialize it in the "show()" method. + +``` {.lang:java .mark:1,2,5,13 .decode:true} + private Camera camera; + private ShapeRenderer render; + + public MenuScreen(StarChaser self) { + this.camera = StarChaser.getCameraInstance(); + this.parent = self; + } + + . . . + + @Override + public void show() { + render = new ShapeRenderer(); + + . . . + + } +``` + +ShapeRenderers are used to draw very simple polygon shapes onto the +screen. In our case we want a rectangle, filled with a colour, that +spans over the entire screen (+10 pixels or so for border) and blends +the background colours with our colour that we give an alpha channel. +Confused? Don't worry, check out the code below (the new render method) +and then I'll go over it bit by bit. + +``` {.lang:java .decode:true} + @Override + public void render(float delta) { + + Gdx.gl20.glEnable(GL20.GL_BLEND); + render.setProjectionMatrix(camera.combined); + render.begin(ShapeType.Filled); + render.setColor(0, 0, 0, 0.5f); + render.rect(-10, -10, Gdx.graphics.getWidth() + 20, Gdx.graphics.getHeight() + 20); + render.end(); + + stage.act(); + stage.draw(); + } +``` + +First we have to call an OpenGL function called "glEnable" which will +enable certain features during render. We pass in the "GL\_BLEND" +parameter (in the GL2.0 package) which will trigger OpenGL to blend +colours together (so allowing two colours to merge slowly instead of +being absolute values). + +Afterwards we take the projection matrix from our camera and set it for +the renderer so that the drawn shapes are in the same reference frame as +the rest of our game. And then we begin the magic. + +We set the Type (Filled), we set a colour (black with 50% alpha), we set +the border (the screen + 10 pixels padding over the screen). And then we +end the renderer. That's it. + +Compile this and look at how it looks. In my opinion a lot better! For +reference, this is what my menu now looks like. Again...you can have +your buttons in different orders, sizes, whatever. + + + +But I hope you understand now how you can create different screens to +make have different tasks. And in the same way that we've now created +this Menuscreen we can make an options screen (We just need to pass +along the Game again and call "setScreen(whatever)" when we're done). + +And at some point I want to make an inventory and trade screen like +this. But that's a long way out. Because next up I actually want to do +some bug-fixing. Things that I missed a few "episodes" ago and thought +it'd be a good learning opportunity. And also teaching you about game +structure a bit more. + +I hope you enjoy this series so far, leave me your feedback in the +comments and I'll see you guys (and gals) next time. Keep coding! diff --git a/teaching/gameofcode/09-libgdx-game-of-codes-modifying-libgdx-part-i.md b/teaching/gameofcode/09-libgdx-game-of-codes-modifying-libgdx-part-i.md new file mode 100755 index 0000000..2555d2d --- /dev/null +++ b/teaching/gameofcode/09-libgdx-game-of-codes-modifying-libgdx-part-i.md @@ -0,0 +1,326 @@ +Title: 09. (LibGDX) Game of Codes: Modifying LibGDX — Part I +Date: 2014-04-04 13:57 +Category: Game of Codes +Tags: Guides +Slug: 09-libgdx-game-of-codes-modifying-libgdx-part-i +Status: published + +Welcome back to the Game of Codes, an introduction series to the LibGDX +framework. It's been a while since my last post and I want to make up +for that today. Last time we were talking about Screens and subscreens +for a game that made showing new information a whole lot faster and more +intuitive as it didn't require more UI elements to be written into the +same class. + +Well…despite what you might think I HAVE been very busy coding on my own +project (\*hinthint\* +[www.spacekookie.de/projects/empires](http://www.spacekookie.de/projects/empires/ "Interstellar Empires") \*hinthint\* +;) ) and have started modifying the LibGDX core a few months ago to +better suit my needs. Well…most of my modifications are pretty specific +to my case. Changing the hexagon renderer to account for my custom data +types, changing the input handling method, etc... But in the last 2 +weeks I have done something that I think can be quite handy and I want +you to see it. Additionally I will be using that example to show you how +modding LibGDX to your own needs can be very productive and even fun. It +will give you the ability to learn and understand how that framework +we've only been using so far is structured and works. And it will remove +some of the magic that you might feel is involved ;) So shall we begin? + + + +First of all I want to show you a graphic again from my last post of the +Game of Codes. + + + +This is how I thought our menu would be, have a screen in front of our +game that then showed some stuff. Well…that's all nice and good IF you +only use one game-screen. But most games aren't that simple. Usually in +a complex game you want to have your background code for music and input +handling or whatever jazz you're doing running in your game but then +have different screens for the Menu, the game, the settings, maybe an +inventory? Who knows? And well…that's all very 1-dimentional. So what I +did first was look at how things were structured in LibGDX. + +``` {.lang:java .decode:true} +public abstract class Game implements ApplicationListener { + private Screen screen; + + . . . + + public void setScreen (Screen screen) { + if (this.screen != null) this.screen.hide(); + this.screen = screen; + if (this.screen != null) { + this.screen.show(); + this.screen.resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); + } + } + + . . . +} +``` + +As you can see the "Game" class that we extend with our MainGame-Class +where we have our ship and station and input and all those lovely assets +implements the ApplicationListener, JUST as our MainGame-class did +before we started working with Screens. Oh and look! There is some of +that code that we use to set a Screen. + +Now…what can we do with this? Well first of all we can create a new +class in our Core package and call it "CustomGame" or anything you like. +But it should be clear that it's something very specific. Make it +abstract and let it implement the ApplicationListener interface, just +like the example above. + +We can also actually just copy most of that code in the stock-Game class +into our own. + +``` {.lang:java .decode:true} +public abstract class CustomGame implements ApplicationListener { + private Screen screen; + + @Override + public void create() { + + } + + @Override + public void resize(int width, int height) { + if (screen != null) + screen.resize(width, height); + + } + + @Override + public void render() { + if (screen != null) + screen.render(Gdx.graphics.getDeltaTime()); + + } + + @Override + public void pause() { + if (screen != null) + screen.pause(); + + } + + @Override + public void resume() { + if (screen != null) + screen.resume(); + + } + + @Override + public void dispose() { + if (screen != null) + screen.dispose(); + + } + + public void setScreen(Screen screen) { + if (this.screen != null) + this.screen.hide(); + this.screen = screen; + if (this.screen != null) { + this.screen.show(); + this.screen.resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); + } + } + + public Screen getScreen() { + return screen; + } + +} +``` + +All that does is exactly what the other class did before. If you now go +into our main-game class and let it extend "CustomGame" instead of +"Game" and compile the game it will run JUST like it did before. Because +nothing has changed. And that's what we'll change RIGHT NOW. + +What do we want? Well…we want to use Screens in our game for the actual +game screens (menu, in-game, settings, cut scenes, etc.) as well as +Screens to display information OVER the current one (for example for an +Inventory screen or dialogue options or WHATEVER!). Now…there are two +things we could do right now: + +The first would be to only add one more screen, call it "overlay" and +copy the same code as for the other screen into the class. That would +give us two screens to work with. But I don't like that idea at all. +Instead I want to do something different. I want to be able to have a +stack of Overlays over each other. And that's why we'll use a +Stack\<Screen\>! + +``` {.lang:java .decode:true} + private Stack<Screen> overlays; + + @Override + public void create() { + overlays = new Stack<Screen>(); + } +``` + +Put this code under the declaration of the private Screen variable and +initialize the stack in your create() method that was (so far) not used. +Now we of course need to make sure we actually call "super.onCreate()" +in our child-class (So our main game-class). + +So far so good. But, we can't actually do anything with that yet. First +we will want to write two access methods for the stack. + +``` {.lang:java .decode:true} + public void addOverlay(Screen overlay) { + overlays.add(overlay); + overlay.show(); + overlay.resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); + } + + public void removeOverlay() { + if (!overlays.isEmpty()) + overlays.pop().dispose(); + } +``` + +What this will do is add a new overlay to the stack when we need one and +also call the show and resize method on the overlay (which is really +just a screen) to set up everything correctly! +The second method will remove the last overlay (if it exists) by +popping it off the stack and calling dispose() on it to finalize. This +is important so that we avoid having un-used and non-removed resources +in our memory. + +So far so good. The problem now is that our screen won't actually be +shown anywhere. Sure, we add it to our stack and show() and resize() it. +But it's not getting rendered. For that to happen we'll have to add some +more code. And in addition to that I would recommend more code to then +dispose of the screens again as well. + +For every action that we take on our main-screen we need to add this +code to it as well. + +``` {.lang:java .decode:true} + if (!overlays.isEmpty()) + for (Screen o : overlays) + o.ACTION_HERE(); +``` + +Essentially iterating over the stack to apply it to every overlay. This +way we can have stacking UI-overlays while the ones in the background +still get rendered. And this is how the final CustomGame class then +looks. + +``` {.lang:java .decode:true} +import java.util.Stack; + +import com.badlogic.gdx.ApplicationListener; +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.Screen; + +public abstract class CustomGame implements ApplicationListener { + private Screen screen; + private Stack overlays; + + @Override + public void create() { + overlays = new Stack(); + } + + @Override + public void resize(int width, int height) { + if (screen != null) + screen.resize(width, height); + + if (!overlays.isEmpty()) + for (Screen o : overlays) + o.resize(width, height); + + } + + @Override + public void render() { + if (screen != null) + screen.render(Gdx.graphics.getDeltaTime()); + + if (!overlays.isEmpty()) + for (Screen o : overlays) + o.render(Gdx.graphics.getDeltaTime()); + + } + + @Override + public void pause() { + if (screen != null) + screen.pause(); + + if (!overlays.isEmpty()) + for (Screen o : overlays) + o.pause(); + + } + + @Override + public void resume() { + if (screen != null) + screen.resume(); + + if (!overlays.isEmpty()) + for (Screen o : overlays) + o.resume(); + + } + + @Override + public void dispose() { + if (screen != null) + screen.dispose(); + + if (!overlays.isEmpty()) + for (Screen o : overlays) + o.dispose(); + + } + + public void setScreen(Screen screen) { + if (this.screen != null) + this.screen.hide(); + this.screen = screen; + if (this.screen != null) { + this.screen.show(); + this.screen.resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); + } + } + + public Screen getScreen() { + return screen; + } + + public void addOverlay(Screen overlay) { + overlays.add(overlay); + overlay.show(); + overlay.resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); + } + + public void removeOverlay() { + if (!overlays.isEmpty()) + overlays.pop().dispose(); + } + +} +``` + +This is it for part 1. I don't want to let this get too long so in PART +2 of this post I'll be showing you what exactly we can do with this. If +you have any questions or suggestions, leave them in the comments below. + +Until then, keep Coding! + + + +==== EDIT ==== + +Do you want this series to get picked up again? Go here: +http://www.spacekookie.de/continue-libgdx-game-of-codes/ diff --git a/teaching/gameofcode/09.5-libgdx-game-of-codes-continuation.md b/teaching/gameofcode/09.5-libgdx-game-of-codes-continuation.md new file mode 100755 index 0000000..964e05f --- /dev/null +++ b/teaching/gameofcode/09.5-libgdx-game-of-codes-continuation.md @@ -0,0 +1,28 @@ +Title: 09.5 (LibGDX) Game of Codes: Continuation - Post ideas +Date: 2015-05-02 12:12 +Category: Game of Codes +Tags: Guides +Slug: continue-libgdx-game-of-codes +Status: published + +Welcome back to the Game of Codes, an introduction series to the LibGDX +framework. In the last post we started messing around with the inner +workings of LibGDX a bit more... + +\*static\* \*voice cracking\* \*buzzing from speakers\* + +"Hello? Can anyone hear me? I think I'm in space...Hello?" + +Right...it's been about a year since I wrote on this series, a lot of +things have changed and I don't nearly have as much time anymore. BUT +people keep messaging me all over the place that they liked my LibGDX +series. SO...if you really do, I will continue it. Though, I'm slightly +out of ideas what to do. And I really have lost interest in continuing +that Star Chaser thing I started. + +So....if you want to see something from me, post it on the comments +below, twitter at me, send me emails or smoke signals. If I get enough +feedback about this I will do it. If not, I'm sure there are better and +more up to date resources out there :) + +So yea, would be cool to hear from you guys \<3 diff --git a/teaching/gameofcode/10-libgdx-game-of-codes-shaders.md b/teaching/gameofcode/10-libgdx-game-of-codes-shaders.md new file mode 100755 index 0000000..083d0fb --- /dev/null +++ b/teaching/gameofcode/10-libgdx-game-of-codes-shaders.md @@ -0,0 +1,7 @@ +Title: 10 (LibGDX) Game of Codes: 50 Shades of Code +Category: Game of Codes +Tags: Guides +Slug: libgdx-game-of-codes-50-shades-of-code +Status: draft + +SHADERS!
\ No newline at end of file diff --git a/theme/README.md b/theme/README.md new file mode 100755 index 0000000..5e6a857 --- /dev/null +++ b/theme/README.md @@ -0,0 +1,114 @@ +# Nest + +This is my very heavily customised website theme for [spacekookie.de](https://spacekookie.de). Not sure why I keep this public as it will probably never be any good for anyone. But oh well ¯\\\_(ツ)_/¯ + +This is a fork that I created as it's own repository. The original is from [https://github.com/molivier/nest](https://github.com/molivier/nest) + +## Features + +* Featured site header image +* Featured article header image +* **Pygments** syntax highlighting +* **Disqus** support for comments +* **Google Analytics** support +* RSS and Atom feeds + +## Settings + +Nest template can be customized by adding parameters to your `pelicanconf.py` file. Template specifics parameters are prefixed with template name. + +### Pelican.conf example + +```python +# NEST Template +THEME = 'nest' +SITESUBTITLE = u'My Awesome Blog' +# Minified CSS +NEST_CSS_MINIFY = True +# Add items to top menu before pages +MENUITEMS = [('Homepage', '/'),('Categories','/categories.html')] +# Add header background image from content/images : 'background.jpg' +NEST_HEADER_IMAGES = '' +NEST_HEADER_LOGO = '/image/logo.png' +# Footer +NEST_SITEMAP_COLUMN_TITLE = u'Sitemap' +NEST_SITEMAP_MENU = [('Archives', '/archives.html'),('Tags','/tags.html'), ('Authors','/authors.html')] +NEST_SITEMAP_ATOM_LINK = u'Atom Feed' +NEST_SITEMAP_RSS_LINK = u'RSS Feed' +NEST_SOCIAL_COLUMN_TITLE = u'Social' +NEST_LINKS_COLUMN_TITLE = u'Links' +NEST_COPYRIGHT = u'© blogname 2015' +# Footer optional +NEST_FOOTER_HTML = '' +# index.html +NEST_INDEX_HEAD_TITLE = u'Homepage' +NEST_INDEX_HEADER_TITLE = u'My Awesome Blog' +NEST_INDEX_HEADER_SUBTITLE = u'Smashing The Stack For Fun And Profit' +NEST_INDEX_CONTENT_TITLE = u'Last Posts' +# archives.html +NEST_ARCHIVES_HEAD_TITLE = u'Archives' +NEST_ARCHIVES_HEAD_DESCRIPTION = u'Posts Archives' +NEST_ARCHIVES_HEADER_TITLE = u'Archives' +NEST_ARCHIVES_HEADER_SUBTITLE = u'Archives for all posts' +NEST_ARCHIVES_CONTENT_TITLE = u'Archives' +# article.html +NEST_ARTICLE_HEADER_BY = u'By' +NEST_ARTICLE_HEADER_MODIFIED = u'modified' +NEST_ARTICLE_HEADER_IN = u'in category' +# author.html +NEST_AUTHOR_HEAD_TITLE = u'Posts by' +NEST_AUTHOR_HEAD_DESCRIPTION = u'Posts by' +NEST_AUTHOR_HEADER_SUBTITLE = u'Posts archives' +NEST_AUTHOR_CONTENT_TITLE = u'Posts' +# authors.html +NEST_AUTHORS_HEAD_TITLE = u'Author list' +NEST_AUTHORS_HEAD_DESCRIPTION = u'Author list' +NEST_AUTHORS_HEADER_TITLE = u'Author list' +NEST_AUTHORS_HEADER_SUBTITLE = u'Archives listed by author' +# categories.html +NEST_CATEGORIES_HEAD_TITLE = u'Categories' +NEST_CATEGORIES_HEAD_DESCRIPTION = u'Archives listed by category' +NEST_CATEGORIES_HEADER_TITLE = u'Categories' +NEST_CATEGORIES_HEADER_SUBTITLE = u'Archives listed by category' +# category.html +NEST_CATEGORY_HEAD_TITLE = u'Category Archive' +NEST_CATEGORY_HEAD_DESCRIPTION = u'Category Archive' +NEST_CATEGORY_HEADER_TITLE = u'Category' +NEST_CATEGORY_HEADER_SUBTITLE = u'Category Archive' +# pagination.html +NEST_PAGINATION_PREVIOUS = u'Previous' +NEST_PAGINATION_NEXT = u'Next' +# period_archives.html +NEST_PERIOD_ARCHIVES_HEAD_TITLE = u'Archives for' +NEST_PERIOD_ARCHIVES_HEAD_DESCRIPTION = u'Archives for' +NEST_PERIOD_ARCHIVES_HEADER_TITLE = u'Archives' +NEST_PERIOD_ARCHIVES_HEADER_SUBTITLE = u'Archives for' +NEST_PERIOD_ARCHIVES_CONTENT_TITLE = u'Archives for' +# tag.html +NEST_TAG_HEAD_TITLE = u'Tag archives' +NEST_TAG_HEAD_DESCRIPTION = u'Tag archives' +NEST_TAG_HEADER_TITLE = u'Tag' +NEST_TAG_HEADER_SUBTITLE = u'Tag archives' +# tags.html +NEST_TAGS_HEAD_TITLE = u'Tags' +NEST_TAGS_HEAD_DESCRIPTION = u'Tags List' +NEST_TAGS_HEADER_TITLE = u'Tags' +NEST_TAGS_HEADER_SUBTITLE = u'Tags List' +NEST_TAGS_CONTENT_TITLE = u'Tags List' +NEST_TAGS_CONTENT_LIST = u'tagged' +# Static files +STATIC_PATHS = ['images', 'extra/robots.txt', 'extra/favicon.ico', 'extra/logo.svg'] +EXTRA_PATH_METADATA = { + 'extra/robots.txt': {'path': 'robots.txt'}, + 'extra/favicon.ico': {'path': 'favicon.ico'}, + 'extra/logo.svg': {'path': 'logo.svg'} +} +``` + + +## Third-party assets + +The theme uses external softwares, scripts, libraries and artworks: + +* [Bootstrap](http://getbootstrap.com/) 3.x.x +* [Open Sans Font](http://www.google.com/fonts/specimen/Open+Sans) diff --git a/article-background.png b/theme/article-background.png Binary files differindex b2fb268..b2fb268 100755 --- a/article-background.png +++ b/theme/article-background.png diff --git a/article.png b/theme/article.png Binary files differindex 24af07f..24af07f 100755 --- a/article.png +++ b/theme/article.png diff --git a/homepage-background.png b/theme/homepage-background.png Binary files differindex 4ea4e33..4ea4e33 100755 --- a/homepage-background.png +++ b/theme/homepage-background.png diff --git a/homepage.png b/theme/homepage.png Binary files differindex 51a9741..51a9741 100755 --- a/homepage.png +++ b/theme/homepage.png diff --git a/static/css/all.min.css b/theme/static/css/all.min.css index ec68e92..ec68e92 100755 --- a/static/css/all.min.css +++ b/theme/static/css/all.min.css diff --git a/static/css/bootstrap.css b/theme/static/css/bootstrap.css index c46af7d..c46af7d 100755 --- a/static/css/bootstrap.css +++ b/theme/static/css/bootstrap.css diff --git a/static/css/bootstrap.css.map b/theme/static/css/bootstrap.css.map index ff579ff..ff579ff 100755 --- a/static/css/bootstrap.css.map +++ b/theme/static/css/bootstrap.css.map diff --git a/static/css/bootstrap.min.css b/theme/static/css/bootstrap.min.css index 28f154d..28f154d 100755 --- a/static/css/bootstrap.min.css +++ b/theme/static/css/bootstrap.min.css diff --git a/static/css/fonts.css b/theme/static/css/fonts.css index 0782a63..0782a63 100755 --- a/static/css/fonts.css +++ b/theme/static/css/fonts.css diff --git a/static/css/home.css b/theme/static/css/home.css index c7e1d67..c7e1d67 100644 --- a/static/css/home.css +++ b/theme/static/css/home.css diff --git a/static/css/nest.css b/theme/static/css/nest.css index f822494..f822494 100755 --- a/static/css/nest.css +++ b/theme/static/css/nest.css diff --git a/static/css/pygment.css b/theme/static/css/pygment.css index 9ba6e1e..9ba6e1e 100755 --- a/static/css/pygment.css +++ b/theme/static/css/pygment.css diff --git a/static/fonts/glyphicons-halflings-regular.eot b/theme/static/fonts/glyphicons-halflings-regular.eot Binary files differindex b93a495..b93a495 100755 --- a/static/fonts/glyphicons-halflings-regular.eot +++ b/theme/static/fonts/glyphicons-halflings-regular.eot diff --git a/static/fonts/glyphicons-halflings-regular.svg b/theme/static/fonts/glyphicons-halflings-regular.svg index 94fb549..94fb549 100755 --- a/static/fonts/glyphicons-halflings-regular.svg +++ b/theme/static/fonts/glyphicons-halflings-regular.svg diff --git a/static/fonts/glyphicons-halflings-regular.ttf b/theme/static/fonts/glyphicons-halflings-regular.ttf Binary files differindex 1413fc6..1413fc6 100755 --- a/static/fonts/glyphicons-halflings-regular.ttf +++ b/theme/static/fonts/glyphicons-halflings-regular.ttf diff --git a/static/fonts/glyphicons-halflings-regular.woff b/theme/static/fonts/glyphicons-halflings-regular.woff Binary files differindex 9e61285..9e61285 100755 --- a/static/fonts/glyphicons-halflings-regular.woff +++ b/theme/static/fonts/glyphicons-halflings-regular.woff diff --git a/static/fonts/glyphicons-halflings-regular.woff2 b/theme/static/fonts/glyphicons-halflings-regular.woff2 Binary files differindex 64539b5..64539b5 100755 --- a/static/fonts/glyphicons-halflings-regular.woff2 +++ b/theme/static/fonts/glyphicons-halflings-regular.woff2 diff --git a/static/img/banner_bg2x.png b/theme/static/img/banner_bg2x.png Binary files differindex 5cd4242..5cd4242 100644 --- a/static/img/banner_bg2x.png +++ b/theme/static/img/banner_bg2x.png diff --git a/static/img/cat.png b/theme/static/img/cat.png Binary files differindex a2fc628..a2fc628 100644 --- a/static/img/cat.png +++ b/theme/static/img/cat.png diff --git a/static/img/grey_2x.png b/theme/static/img/grey_2x.png Binary files differindex eba36c7..eba36c7 100644 --- a/static/img/grey_2x.png +++ b/theme/static/img/grey_2x.png diff --git a/static/js/random_colour.js b/theme/static/js/random_colour.js index 2036138..2036138 100644 --- a/static/js/random_colour.js +++ b/theme/static/js/random_colour.js diff --git a/templates/archives.html b/theme/templates/archives.html index fb31236..fb31236 100755 --- a/templates/archives.html +++ b/theme/templates/archives.html diff --git a/templates/article.html b/theme/templates/article.html index 165bd08..165bd08 100755 --- a/templates/article.html +++ b/theme/templates/article.html diff --git a/templates/author.html b/theme/templates/author.html index fdd3f30..fdd3f30 100755 --- a/templates/author.html +++ b/theme/templates/author.html diff --git a/templates/authors.html b/theme/templates/authors.html index b490f5a..b490f5a 100755 --- a/templates/authors.html +++ b/theme/templates/authors.html diff --git a/templates/base.html b/theme/templates/base.html index 17866d2..17866d2 100755 --- a/templates/base.html +++ b/theme/templates/base.html diff --git a/templates/categories.html b/theme/templates/categories.html index fa44f11..fa44f11 100755 --- a/templates/categories.html +++ b/theme/templates/categories.html diff --git a/templates/category.html b/theme/templates/category.html index b1a1c69..b1a1c69 100755 --- a/templates/category.html +++ b/theme/templates/category.html diff --git a/templates/home.html b/theme/templates/home.html index 1dc43e8..1dc43e8 100755 --- a/templates/home.html +++ b/theme/templates/home.html diff --git a/templates/index.html b/theme/templates/index.html index dd9ac22..dd9ac22 100755 --- a/templates/index.html +++ b/theme/templates/index.html diff --git a/templates/master.html b/theme/templates/master.html index e73e2c1..e73e2c1 100755 --- a/templates/master.html +++ b/theme/templates/master.html diff --git a/templates/newbase.html b/theme/templates/newbase.html index 8242dc7..8242dc7 100644 --- a/templates/newbase.html +++ b/theme/templates/newbase.html diff --git a/templates/page.html b/theme/templates/page.html index 45020fe..45020fe 100755 --- a/templates/page.html +++ b/theme/templates/page.html diff --git a/templates/pagination.html b/theme/templates/pagination.html index a914cfb..a914cfb 100755 --- a/templates/pagination.html +++ b/theme/templates/pagination.html diff --git a/templates/period_archives.html b/theme/templates/period_archives.html index 1ae1799..1ae1799 100755 --- a/templates/period_archives.html +++ b/theme/templates/period_archives.html diff --git a/templates/tag.html b/theme/templates/tag.html index 85cdda7..85cdda7 100755 --- a/templates/tag.html +++ b/theme/templates/tag.html diff --git a/templates/tags.html b/theme/templates/tags.html index bc0a450..bc0a450 100755 --- a/templates/tags.html +++ b/theme/templates/tags.html diff --git a/templates/translations.html b/theme/templates/translations.html index f40a187..f40a187 100755 --- a/templates/translations.html +++ b/theme/templates/translations.html diff --git a/tutorials/series2/framelife.odg b/tutorials/series2/framelife.odg Binary files differnew file mode 100644 index 0000000..afe94ba --- /dev/null +++ b/tutorials/series2/framelife.odg |
