Skip to content

Commit

Permalink
Overhaul the README
Browse files Browse the repository at this point in the history
Add Ko-fi support link - hopefully get some support for the project, that would be nice.
Hopefully fix the simulation bug for released builds.
  • Loading branch information
CmdrDats committed Oct 30, 2021
1 parent c2f0f9e commit cab13e4
Show file tree
Hide file tree
Showing 22 changed files with 225 additions and 124 deletions.
304 changes: 191 additions & 113 deletions README.md

Large diffs are not rendered by default.

Binary file added doc/images/announcer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed doc/images/goboard.jpg
Binary file not shown.
Binary file removed doc/images/goboard.png
Binary file not shown.
Binary file added doc/images/ogs-gamelist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/ogs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/projector-checker.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/projector.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed doc/images/screen0.jpg
Binary file not shown.
Binary file removed doc/images/screen1.jpg
Binary file not shown.
Binary file added doc/images/screen1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed doc/images/screen2.jpg
Binary file not shown.
Binary file removed doc/images/screen3.jpg
Binary file not shown.
Binary file removed doc/images/screen4.jpg
Binary file not shown.
Binary file removed doc/images/screen5.jpg
Binary file not shown.
Binary file removed doc/images/screen6.jpg
Binary file not shown.
Binary file removed doc/images/screen7.jpg
Binary file not shown.
Binary file removed doc/images/screen8.jpg
Binary file not shown.
Binary file added resources/kofi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 17 additions & 7 deletions src/igoki/simulated.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
[igoki.litequil :as lq]
[igoki.util :as util]
[igoki.ui.util :as ui.util]
[seesaw.core :as s])
[seesaw.core :as s]
[clojure.java.io :as io])
(:import
(java.io File)
(org.opencv.core Mat Point Scalar MatOfPoint MatOfByte)
(de.schlichtherle.truezip.fs FsEntryNotFoundException)
(java.awt.event MouseEvent)
Expand Down Expand Up @@ -217,12 +219,20 @@
(lq/image (:bufimg pimg) 0 0 (lq/width) (lq/height)))))

(defn start-simulation [ctx]
(swap! simctx
(fn [s]
(->
s
(assoc :stopped false)
(update :sim assoc :background (Imgcodecs/imread "./resources/wooden-background.jpg")))))
(try
;; This tmp song and dance because Imgcodes takes a filename string :'/
(let [tmp (File/createTempFile "background" "jpg")]
(io/copy (io/input-stream (io/resource "wooden-background.jpg")) tmp)

(swap! simctx
(fn [s]
(->
s
(assoc :stopped false)
(update :sim assoc :background (Imgcodecs/imread (.getAbsolutePath tmp)))))))
(catch Exception e
(.printStackTrace e)))

(reset-board simctx 19)

(doto
Expand Down
19 changes: 16 additions & 3 deletions src/igoki/ui/calibration.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
[igoki.camera :as camera]
[igoki.litequil :as lq]
[igoki.util :as util]
[igoki.projector :as projector])
[igoki.projector :as projector]
[clojure.java.io :as io]
[igoki.ui.util :as ui.util])
(:import
(javax.swing JComboBox)))
(javax.swing JComboBox BorderFactory)))

(defn calibration-options [ctx]
(s/flow-panel
Expand Down Expand Up @@ -45,7 +47,17 @@
:listen
[:action
(fn [e]
(projector/start-cframe ctx))])]))
(projector/start-cframe ctx))])
[20 :by 10]
(s/button
:id :kofi-button
:icon (io/resource "kofi.png")
:border (BorderFactory/createEmptyBorder)
:focusable? false
:listen
[:action
(fn [e]
(ui.util/open "https://ko-fi.com/cmdrdats"))])]))

(defn construct [ctx]
(lq/smooth)
Expand Down Expand Up @@ -152,6 +164,7 @@

(defn calibration-panel [ctx]
(s/border-panel
:id :calibration-panel
:south
(calibration-options ctx)
:center
Expand Down
2 changes: 1 addition & 1 deletion src/igoki/ui/ogs.clj
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
["Client Secret: " "align label"]
[(s/password :id :client-secret :columns 24) "wrap"]
["Client Type: " "align label"]
["Secret" "wrap"]
["Confidential" "wrap"]
["Authorization Grant Type: " "align label"]
["Password" "wrap"]
["" "span, center, gapbottom 15"]
Expand Down

0 comments on commit cab13e4

Please sign in to comment.