Mercurial > vba-clojure

comparison clojure/com/aurellem/run/image.clj @ 504:81e43f0350db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolved conflict.
author Robert McIntyre <rlm@mit.edu>
date Mon, 18 Jun 2012 18:56:49 -0500
parents 4703b74f1fb1
children f992a0a0480d
comparison
equal deleted inserted replaced
503:4703b74f1fb1 504:81e43f0350db
124 (flatten (map gb-rgb->bits palettes)))])) 124 (flatten (map gb-rgb->bits palettes)))]))
125 125
126 (defn display-one-color 126 (defn display-one-color
127 "Displayes a single color onto the gameboy screen. input rgb in 127 "Displayes a single color onto the gameboy screen. input rgb in
128 gameboy rgb." 128 gameboy rgb."
129 <<<<<<< local
130 [[r g b]]
131 ;; construct a kernel that displays a single color
132 (let
133 [palettes (repeat 8 [r g b])
134 kernel-address 0xC000
135 kernel
136 [0xF3 ;; disable interrupts
137 (clear-music-registers)
138 (frame-metronome)
139 (set-palettes obj-palette-select obj-palette-data palettes)
140 (set-palettes bg-palette-select bg-palette-data palettes)
141 (infinite-loop)]]
142 (-> (set-memory-range (second (music-base))
143 kernel-address (flatten kernel))
144 (PC! kernel-address))))
145 =======
129 ([state [r g b]] 146 ([state [r g b]]
130 ;; construct a kernel that displays a single color 147 ;; construct a kernel that displays a single color
131 (let 148 (let
132 [palettes (repeat 8 [r g b]) 149 [palettes (repeat 8 [r g b])
133 kernel-address 0xC000 150 kernel-address 0xC000
323 (conj accepted new-element))) 340 (conj accepted new-element)))
324 [] 341 []
325 (sort-by (comp - count) objs))) 342 (sort-by (comp - count) objs)))
326 343
327 (defn absorb-combine-4 [objs] 344 (defn absorb-combine-4 [objs]
345
328 346
329 347
330 ) 348 )
331 349
332 (defn palettes [^BufferedImage image] 350 (defn palettes [^BufferedImage image]