Delay initializing the global icons (#354)

* delay initializing the global icons, so we don't generate them for each hex file

* Moving the strings to flash
This commit is contained in:
Abhijith Chatra 2017-02-10 16:33:52 -08:00 committed by Peli de Halleux
parent a5cb663316
commit 19e609c245

View File

@ -105,7 +105,7 @@ enum IconNames {
//% block="square" //% block="square"
Square, Square,
//% block="small square" //% block="small square"
SmallSquare SmallSquare,
} }
enum ArrowNames { enum ArrowNames {
@ -155,355 +155,325 @@ namespace basic {
namespace images { namespace images {
const heart = ` function getArrow(i : ArrowNames): string {
. # . # . switch(i) {
# # # # #
# # # # #
. # # # .
. . # . .`
const small_heart = `
. . . . .
. # . # .
. # # # .
. . # . .
. . . . .`
//faces
const happy_face = `
. . . . .
. # . # .
. . . . .
# . . . #
. # # # .`
const sad_face = `
. . . . .
. # . # .
. . . . .
. # # # .
# . . . #`
const confused_face = `
. . . . .
. # . # .
. . . . .
. # . # .
# . # . #`
const angry_face = `
# . . . #
. # . # .
. . . . .
# # # # #
# . # . #`
const asleep_face = `
. . . . .
# # . # #
. . . . .
. # # # .
. . . . .`
const surprised_face = `
. # . # .
. . . . .
. . # . .
. # . # .
. . # . .`
const silly_face = `
# . . . #
. . . . .
# # # # #
. . . # #
. . . # #`
const fabulous_face = `
# # # # #
# # . # #
. . . . .
. # . # .
. # # # .`
const meh_face = `
# # . # #
. . . . .
. . . # .
. . # . .
. # . . .`
const yes = `
. . . . .
. . . . #
. . . # .
# . # . .
. # . . .`
const no = `
# . . . #
. # . # .
. . # . .
. # . # .
# . . . #`
// compass directions // compass directions
case ArrowNames.North: return `
const arrow_n = `
. . # . . . . # . .
. # # # . . # # # .
# . # . # # . # . #
. . # . . . . # . .
. . # . .` . . # . .`;
case ArrowNames.NorthEast: return `
const arrow_ne = `
. . # # # . . # # #
. . . # # . . . # #
. . # . # . . # . #
. # . . . . # . . .
# . . . .` # . . . .`;
case ArrowNames.East: return `
const arrow_e = `
. . # . . . . # . .
. . . # . . . . # .
# # # # # # # # # #
. . . # . . . . # .
. . # . .` . . # . .`;
case ArrowNames.SouthEast: return `
const arrow_se = `
# . . . . # . . . .
. # . . . . # . . .
. . # . # . . # . #
. . . # # . . . # #
. . # # #` . . # # #`;
case ArrowNames.South: return `
const arrow_s = `
. . # . . . . # . .
. . # . . . . # . .
# . # . # # . # . #
. # # # . . # # # .
. . # . .` . . # . .`;
case ArrowNames.SouthWest: return `
const arrow_sw = `
. . . . # . . . . #
. . . # . . . . # .
# . # . . # . # . .
# # . . . # # . . .
# # # . .` # # # . .`;
case ArrowNames.West: return `
const arrow_w = `
. . # . . . . # . .
. # . . . . # . . .
# # # # # # # # # #
. # . . . . # . . .
. . # . .` . . # . .`;
case ArrowNames.NorthWest: return `
const arrow_nw = `
# # # . . # # # . .
# # . . . # # . . .
# . # . . # . # . .
. . . # . . . . # .
. . . . #` . . . . #`;
default: return `
. . . . .
. . . . .
. . . . .
. . . . .
. . . . .
`;
}
}
// geometry function getIcon(i: IconNames): string {
const triangle = ` switch (i) {
case IconNames.Heart : return `
. # . # .
# # # # #
# # # # #
. # # # .
. . # . .`;
case IconNames.SmallHeart : return `
. . . . .
. # . # .
. # # # .
. . # . .
. . . . .`;
//faces
case IconNames.Happy: return `
. . . . .
. # . # .
. . . . .
# . . . #
. # # # .`;
case IconNames.Sad: return `
. . . . .
. # . # .
. . . . .
. # # # .
# . . . #`;
case IconNames.Confused: return `
. . . . .
. # . # .
. . . . .
. # . # .
# . # . #`;
case IconNames.Angry: return `
# . . . #
. # . # .
. . . . .
# # # # #
# . # . #`;
case IconNames.Asleep: return `
. . . . .
# # . # #
. . . . .
. # # # .
. . . . .`;
case IconNames.Surprised: return `
. # . # .
. . . . .
. . # . .
. # . # .
. . # . .`;
case IconNames.Silly: return `
# . . . #
. . . . .
# # # # #
. . . # #
. . . # #`;
case IconNames.Fabulous: return `
# # # # #
# # . # #
. . . . .
. # . # .
. # # # .`;
case IconNames.Meh: return `
# # . # #
. . . . .
. . . # .
. . # . .
. # . . .`;
case IconNames.Yes: return `
. . . . .
. . . . #
. . . # .
# . # . .
. # . . .`;
case IconNames.No: return `
# . . . #
. # . # .
. . # . .
. # . # .
# . . . #`;
case IconNames.Triangle: return `
. . . . . . . . . .
. . # . . . . # . .
. # . # . . # . # .
# # # # # # # # # #
. . . . .` . . . . .`;
case IconNames.LeftTriangle: return `
const left_triangle = `
# . . . . # . . . .
# # . . . # # . . .
# . # . . # . # . .
# . . # . # . . # .
# # # # #` # # # # #`;
case IconNames.Chessboard: return `
const chessboard = `
. # . # . . # . # .
# . # . # # . # . #
. # . # . . # . # .
# . # . # # . # . #
. # . # .` . # . # .`;
case IconNames.Diamond: return `
const diamond = `
. . # . . . . # . .
. # . # . . # . # .
# . . . # # . . . #
. # . # . . # . # .
. . # . .` . . # . .`;
case IconNames.SmallDiamond: return `
const small_diamond = `
. . . . . . . . . .
. . # . . . . # . .
. # . # . . # . # .
. . # . . . . # . .
. . . . .` . . . . .`;
case IconNames.Square: return `
const square = `
# # # # # # # # # #
# . . . # # . . . #
# . . . # # . . . #
# . . . # # . . . #
# # # # #` # # # # #`;
case IconNames.SmallSquare: return `
const small_square = `
. . . . . . . . . .
. # # # . . # # # .
. # . # . . # . # .
. # # # . . # # # .
. . . . .` . . . . .`;
// The following images were designed by Abbie Brooks. // The following images were designed by Abbie Brooks.
case IconNames.TShirt: return `
const tshirt = `
# # . # # # # . # #
# # # # # # # # # #
. # # # . . # # # .
. # # # . . # # # .
. # # # .` . # # # .`;
case IconNames.Rollerskate: return `
const rollerskate = `
. . . # # . . . # #
. . . # # . . . # #
# # # # # # # # # #
# # # # # # # # # #
. # . # .` . # . # .`;
case IconNames.Duck: return `
const duck = `
. # # . . . # # . .
# # # . . # # # . .
. # # # # . # # # #
. # # # . . # # # .
. .. . .` . .. . .`;
case IconNames.House: return `
const house = `
. . # . . . . # . .
. # # # . . # # # .
# # # # # # # # # #
. # # # . . # # # .
. # . # .` . # . # .`;
case IconNames.Tortoise: return `
const tortoise = `
. . . . . . . . . .
. # # # . . # # # .
# # # # # # # # # #
. # . # . . # . # .
. . . . .` . . . . .`;
case IconNames.Butterfly: return `
const butterfly = `
# # . # # # # . # #
# # # # # # # # # #
. . # . . . . # . .
# # # # # # # # # #
# # . # #` # # . # #`;
case IconNames.StickFigure: return `
const stick_figure = `
. . # . . . . # . .
# # # # # # # # # #
. . # . . . . # . .
. # . # . . # . # .
# . . . #` # . . . #`;
case IconNames.Ghost: return `
const ghost = `
. # # # . . # # # .
# . # . # # . # . #
# # # # # # # # # #
# # # # # # # # # #
# . # . #` # . # . #`;
case IconNames.Sword: return `
const sword = `
. . # . . . . # . .
. . # . . . . # . .
. . # . . . . # . .
. # # # . . # # # .
. . # . .` . . # . .`;
case IconNames.Giraffe: return `
const giraffe = `
# # . . . # # . . .
. # . . . . # . . .
. # . . . . # . . .
. # # # . . # # # .
. # . # .` . # . # .`;
case IconNames.Skull: return `
const skull = `
. # # # . . # # # .
# . # . # # . # . #
# # # # # # # # # #
. # # # . . # # # .
. # # # .` . # # # .`;
case IconNames.Umbrella: return `
const umbrella = `
. # # # . . # # # .
# # # # # # # # # #
. . # . . . . # . .
# . # . . # . # . .
# # # . .` # # # . .`;
case IconNames.Snake: return `
const snake = `
# # . . . # # . . .
# # . # # # # . # #
. # . # . . # . # .
. # # # . . # # # .
. . . . .` . . . . .`;
// animals // animals
case IconNames.Rabbit: return `
const rabbit = `
# . # . . # . # . .
# . # . . # . # . .
# # # # . # # # # .
# # . # . # # . # .
# # # # .` # # # # .`;
case IconNames.Cow: return `
const cow = `
# . . . # # . . . #
# . . . # # . . . #
# # # # # # # # # #
. # # # . . # # # .
. . # . .` . . # . .`;
// musical notes // musical notes
case IconNames.QuarterNote: return `
const quarter_note = `
. . # . . . . # . .
. . # . . . . # . .
. . # . . . . # . .
# # # . . # # # . .
# # # . .` # # # . .`;
case IconNames.EigthNote: return `
const eigth_note = `
. . # . . . . # . .
. . # # . . . # # .
. . # . # . . # . #
# # # . . # # # . .
# # # . .` # # # . .`;
// other icons // other icons
case IconNames.Pitchfork: return `
const pitchfork = `
# . # . # # . # . #
# . # . # # . # . #
# # # # # # # # # #
. . # . . . . # . .
. . # . .` . . # . .`;
case IconNames.Pacman: return `
const pacman = `
. # # # # . # # # #
# # # # . # # # # .
# # # . . # # # . .
# # # # . # # # # .
. # # # #` . # # # #`;
case IconNames.Target: return `
const target = `
. . # . . . . # . .
. # # # . . # # # .
# # . # # # # . # #
. # # # . . # # # .
. . # . .` . . # . .`;
default: return `
. . . . .
. . . . .
. . . . .
. . . . .
. . . . .
`;
}
}
//% weight=50 blockGap=8 //% weight=50 blockGap=8
//% blockId=device_arrow block="%arrow" //% blockId=device_arrow block="%arrow"
@ -522,17 +492,7 @@ namespace images {
. . . . . . . . . .
. . . . . . . . . .
`) `)
switch (i) { return set(res, getArrow(i));
case ArrowNames.North: return set(res, arrow_n)
case ArrowNames.NorthEast: return set(res, arrow_ne)
case ArrowNames.East: return set(res, arrow_e)
case ArrowNames.SouthEast: return set(res, arrow_se)
case ArrowNames.South: return set(res, arrow_s)
case ArrowNames.SouthWest: return set(res, arrow_sw)
case ArrowNames.West: return set(res, arrow_w)
case ArrowNames.NorthWest: return set(res, arrow_nw)
}
return res;
} }
//% weight=50 blockGap=8 //% weight=50 blockGap=8
@ -545,54 +505,7 @@ namespace images {
. . . . . . . . . .
. . . . . . . . . .
`) `)
switch (i) { return set(res, getIcon(i));
case IconNames.Heart: return set(res, heart)
case IconNames.SmallHeart: return set(res, small_heart)
case IconNames.Yes: return set(res, yes)
case IconNames.No: return set(res, no)
case IconNames.Happy: return set(res, happy_face)
case IconNames.Sad: return set(res, sad_face)
case IconNames.Confused: return set(res, confused_face)
case IconNames.Angry: return set(res, angry_face)
case IconNames.Asleep: return set(res, asleep_face)
case IconNames.Surprised: return set(res, surprised_face)
case IconNames.Silly: return set(res, silly_face)
case IconNames.Fabulous: return set(res, fabulous_face)
case IconNames.Meh: return set(res, meh_face)
case IconNames.TShirt: return set(res, tshirt)
case IconNames.Rollerskate: return set(res, rollerskate)
case IconNames.Duck: return set(res, duck)
case IconNames.House: return set(res, house)
case IconNames.Tortoise: return set(res, tortoise)
case IconNames.Butterfly: return set(res, butterfly)
case IconNames.StickFigure: return set(res, stick_figure)
case IconNames.Ghost: return set(res, ghost)
case IconNames.Sword: return set(res, sword)
case IconNames.Giraffe: return set(res, giraffe)
case IconNames.Skull: return set(res, skull)
case IconNames.Umbrella: return set(res, umbrella)
case IconNames.Snake: return set(res, snake)
case IconNames.Rabbit: return set(res, rabbit)
case IconNames.Cow: return set(res, cow)
case IconNames.QuarterNote: return set(res, quarter_note)
case IconNames.EigthNote: return set(res, eigth_note)
case IconNames.Pitchfork: return set(res, pitchfork)
case IconNames.Pacman: return set(res, pacman)
case IconNames.Target: return set(res, target)
case IconNames.Triangle: return set(res, triangle)
case IconNames.LeftTriangle: return set(res, left_triangle)
case IconNames.Chessboard: return set(res, chessboard)
case IconNames.Diamond: return set(res, diamond)
case IconNames.SmallDiamond: return set(res, small_diamond)
case IconNames.Square: return set(res, square)
case IconNames.SmallSquare: return set(res, small_square)
}
return res;
} }
function set(res: Image, s: string) { function set(res: Image, s: string) {