Skip to content

Commit 21722ea

Browse files
iffyiffy
committed
Remove SDL/OpenGL
1 parent 0ad9d2c commit 21722ea

File tree

1,997 files changed

+7120
-822604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,997 files changed

+7120
-822604
lines changed

‎CONTRIBUTING.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ Wiish components are meant to be replaceable and expendable. For instance:
2525

2626
- You should be able to use the `wiish` command line tool without importing anything from `wiish` in your app.
2727

28-
- If you want to write low-level OpenGL, you should be able to do that. Or if you want to use a higher-level library, you should be able to do that, too.
29-
3028
- Auto-updating and logging should be usable no matter what GUI library you use.
3129

3230
In other words, components shouldn't be interwined so much that they're inseparable. Instead, they should be easily replaced. Also, you should always be able to drop down to a lower level if needed.

‎README.md

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ See `wiish --help` for more, but here are other examples. Some only work within
4141
wiish run --os ios-simulator
4242
wiish run --os android
4343
wiish build
44-
wiish init --base-template opengl my_opengl_app
4544
```
4645
4746
# Features
@@ -57,7 +56,6 @@ Wiish provides:
5756
Wiish uses a plugin system to support various GUI frameworks:
5857
5958
- `wiish/plugins/webview` - For webview apps based on [oskca/webview](https://github.com/oskca/webview).
60-
- `wiish/plugins/sdl2` - **TEMPORARILY UNMAINTAINED** For SDL and OpenGL apps based on [nim-lang/sdl2](https://github.com/nim-lang/sdl2).
6159
6260
The GUI component is designed to work separately from other features (e.g. auto-updating, packaging, etc...) so that different GUI libraries can be swapped in/out.
6361
@@ -75,41 +73,19 @@ The following shows the support matrix of **automated** tests. Actual support m
7573
7674
| Host OS | `--os` | Example | `wiish run` | `wiish build` |
7775
| ------- | ------------- | ------------ | :---------: | :-----------: |
78-
| windows | android | opengl | Planned | Planned |
79-
| windows | android | sdl2 | Planned | Planned |
8076
| windows | android | webview | Planned | Planned |
81-
| windows | mobiledev | opengl | Untested | - |
82-
| windows | mobiledev | sdl2 | Untested | - |
8377
| windows | mobiledev | webview | Untested | - |
84-
| windows | windows | opengl | Untested | Planned |
8578
| windows | windows | plainwebview | Untested | Planned |
86-
| windows | windows | sdl2 | Untested | Planned |
8779
| windows | windows | webview | Untested | Planned |
88-
| linux | android | opengl | Planned | Yes |
89-
| linux | android | sdl2 | Planned | Yes |
9080
| linux | android | webview | Planned | Yes |
91-
| linux | mobiledev | opengl | Yes | - |
92-
| linux | mobiledev | sdl2 | Yes | - |
9381
| linux | mobiledev | webview | Yes | - |
94-
| linux | linux | opengl | Yes | Planned |
9582
| linux | linux | plainwebview | Yes | Planned |
96-
| linux | linux | sdl2 | Yes | Planned |
9783
| linux | linux | webview | Yes | Planned |
98-
| mac | android | opengl | Yes | Yes |
99-
| mac | android | sdl2 | Yes | Yes |
10084
| mac | android | webview | Yes | Yes |
101-
| mac | ios | opengl | Planned | Planned |
102-
| mac | ios | sdl2 | Planned | Planned |
10385
| mac | ios | webview | Planned | Planned |
104-
| mac | ios-simulator | opengl | Yes | Yes |
105-
| mac | ios-simulator | sdl2 | Yes | Yes |
10686
| mac | ios-simulator | webview | Yes | Yes |
107-
| mac | mobiledev | opengl | Yes | - |
108-
| mac | mobiledev | sdl2 | Yes | - |
10987
| mac | mobiledev | webview | Yes | - |
110-
| mac | mac | opengl | Yes | Yes |
11188
| mac | mac | plainwebview | Yes | Yes |
112-
| mac | mac | sdl2 | Yes | Yes |
11389
| mac | mac | webview | Yes | Yes |
11490
11591
### GUI-independent features
@@ -143,9 +119,7 @@ See the [`examples`](./examples) directory for more examples of how to use this
143119
144120
# Plugins
145121
146-
## sdl2
147-
148-
## webview|
122+
## webview
149123
150124
### Messaging
151125

‎TODO

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
[ ] SDL mobile lifecycle events
2-
[ ] mobiledev SDL
31
[ ] mobiledev webview
4-
[ ] OpenGL Android
5-
[ ] SDL Android
62
[ ] Windows
73
[ ] Linux
84

95
Rename some thing:
10-
[ ] WiishSDL2Plugin -> WiishSDLPlugin
116
[ ] WiishBuild -> WiishPlugin
12-
[ ] sdl2.nim -> wiishsdl.nim
137

‎changes/break-Removed-support-for-20230710-090159.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Removed support for SDL/OpenGL. It's too much to maintain and I don't use it.

‎docs/androidutil.html

Lines changed: 227 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,227 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
3+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4+
<!-- This file is generated by Nim. -->
5+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
6+
<head>
7+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
8+
9+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
10+
11+
<!-- Favicon -->
12+
<link rel="shortcut icon" href="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAAAAAUAAAAF////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAAAAAIAAABbAAAAlQAAAKIAAACbAAAAmwAAAKIAAACVAAAAWwAAAAL///8A////AP///wD///8A////AAAAABQAAADAAAAAYwAAAA3///8A////AP///wD///8AAAAADQAAAGMAAADAAAAAFP///wD///8A////AP///wAAAACdAAAAOv///wD///8A////AP///wD///8A////AP///wD///8AAAAAOgAAAJ3///8A////AP///wAAAAAnAAAAcP///wAAAAAoAAAASv///wD///8A////AP///wAAAABKAAAAKP///wAAAABwAAAAJ////wD///8AAAAAgQAAABwAAACIAAAAkAAAAJMAAACtAAAAFQAAABUAAACtAAAAkwAAAJAAAACIAAAAHAAAAIH///8A////AAAAAKQAAACrAAAAaP///wD///8AAAAARQAAANIAAADSAAAARf///wD///8AAAAAaAAAAKsAAACk////AAAAADMAAACcAAAAnQAAABj///8A////AP///wAAAAAYAAAAGP///wD///8A////AAAAABgAAACdAAAAnAAAADMAAAB1AAAAwwAAAP8AAADpAAAAsQAAAE4AAAAb////AP///wAAAAAbAAAATgAAALEAAADpAAAA/wAAAMMAAAB1AAAAtwAAAOkAAAD/AAAA/wAAAP8AAADvAAAA3gAAAN4AAADeAAAA3gAAAO8AAAD/AAAA/wAAAP8AAADpAAAAtwAAAGUAAAA/AAAA3wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADfAAAAPwAAAGX///8A////AAAAAEgAAADtAAAAvwAAAL0AAADGAAAA7wAAAO8AAADGAAAAvQAAAL8AAADtAAAASP///wD///8A////AP///wD///8AAAAAO////wD///8A////AAAAAIcAAACH////AP///wD///8AAAAAO////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A//8AAP//AAD4HwAA7/cAAN/7AAD//wAAoYUAAJ55AACf+QAAh+EAAAAAAADAAwAA4AcAAP5/AAD//wAA//8AAA=="/>
13+
<link rel="icon" type="image/png" sizes="32x32" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH4QQQEwksSS9ZWwAAAk1JREFUWMPtll2ITVEUx39nn/O7Y5qR8f05wtCUUr6ZIS++8pEnkZInPImneaCQ5METNdOkeFBKUhMPRIkHKfEuUZSUlGlKPN2TrgfncpvmnntnmlEyq1Z7t89/rf9a6+y99oZxGZf/XeIq61EdtgKXgdXA0xrYAvBjOIF1AI9zvjcC74BSpndrJPkBWDScTF8Aa4E3wDlgHbASaANmVqlcCnwHvgDvgVfAJ+AikAAvgfVZwLnSVZHZaOuKoQi3ZOMi4NkYkpe1p4J7A8BpYAD49hfIy/oqG0+hLomiKP2L5L+1ubn5115S+3OAn4EnwBlgMzCjyt6ZAnQCJ4A7wOs88iRJHvw50HoujuPBoCKwHWiosy8MdfZnAdcHk8dxXFJ3VQbQlCTJvRBCGdRbD4M6uc5glpY3eAihpN5S5w12diSEcCCEcKUO4ljdr15T76ur1FDDLIQQ3qv71EdDOe3Kxj3leRXyk+pxdWnFWod6Wt2bY3de3aSuUHcPBVimHs7mK9WrmeOF6lR1o9qnzskh2ar2qm1qizpfXaPeVGdlmGN5pb09qMxz1Xb1kLqgzn1RyH7JUXW52lr5e/Kqi9qpto7V1atuUzfnARrV7jEib1T76gG2qxdGmXyiekkt1GswPTtek0aBfJp6YySGBfWg2tPQ0FAYgf1stUfdmdcjarbYJEniKIq6gY/Aw+zWHAC+p2labGpqiorFYgGYCEzN7oQdQClN07O1/EfDyGgC0ALMBdYAi4FyK+4H3gLPsxfR1zRNi+NP7nH5J+QntnXe5B5mpfQAAAAASUVORK5CYII=">
14+
15+
<!-- Google fonts -->
16+
<link href='https://fonts.googleapis.com/css?family=Lato:400,600,900' rel='stylesheet' type='text/css'/>
17+
<link href='https://fonts.googleapis.com/css?family=Source+Code+Pro:400,500,600' rel='stylesheet' type='text/css'/>
18+
19+
<!-- CSS -->
20+
<title>androidutil</title>
21+
<link rel="stylesheet" type="text/css" href="nimdoc.out.css">
22+
23+
<script type="text/javascript" src="dochack.js"></script>
24+
25+
<script type="text/javascript">
26+
function main() {
27+
var pragmaDots = document.getElementsByClassName("pragmadots");
28+
for (var i = 0; i < pragmaDots.length; i++) {
29+
pragmaDots[i].onclick = function(event) {
30+
// Hide tease
31+
event.target.parentNode.style.display = "none";
32+
// Show actual
33+
event.target.parentNode.nextElementSibling.style.display = "inline";
34+
}
35+
}
36+
37+
function switchTheme(e) {
38+
if (e.target.checked) {
39+
document.documentElement.setAttribute('data-theme', 'dark');
40+
localStorage.setItem('theme', 'dark');
41+
} else {
42+
document.documentElement.setAttribute('data-theme', 'light');
43+
localStorage.setItem('theme', 'light');
44+
}
45+
}
46+
47+
const toggleSwitch = document.querySelector('.theme-switch input[type="checkbox"]');
48+
if (toggleSwitch !== null) {
49+
toggleSwitch.addEventListener('change', switchTheme, false);
50+
}
51+
52+
var currentTheme = localStorage.getItem('theme');
53+
if (!currentTheme && window.matchMedia('(prefers-color-scheme: dark)').matches) {
54+
currentTheme = 'dark';
55+
}
56+
if (currentTheme) {
57+
document.documentElement.setAttribute('data-theme', currentTheme);
58+
59+
if (currentTheme === 'dark' && toggleSwitch !== null) {
60+
toggleSwitch.checked = true;
61+
}
62+
}
63+
}
64+
65+
window.addEventListener('DOMContentLoaded', main);
66+
</script>
67+
68+
</head>
69+
<body>
70+
<div class="document" id="documentId">
71+
<div class="container">
72+
<h1 class="title">androidutil</h1>
73+
<div class="row">
74+
<div class="three columns">
75+
<div class="theme-switch-wrapper">
76+
<label class="theme-switch" for="checkbox">
77+
<input type="checkbox" id="checkbox" />
78+
<div class="slider round"></div>
79+
</label>
80+
&nbsp;&nbsp;&nbsp; <em>Dark Mode</em>
81+
</div>
82+
<div id="global-links">
83+
<ul class="simple">
84+
<li>
85+
<a href="theindex.html">Index</a>
86+
</li>
87+
</ul>
88+
</div>
89+
<div id="searchInputDiv">
90+
Search: <input type="text" id="searchInput"
91+
onkeyup="search()" />
92+
</div>
93+
<div>
94+
Group by:
95+
<select onchange="groupBy(this.value)">
96+
<option value="section">Section</option>
97+
<option value="type">Type</option>
98+
</select>
99+
</div>
100+
<ul class="simple simple-toc" id="toc-list">
101+
<li>
102+
<a class="reference reference-toplevel" href="#7" id="57">Types</a>
103+
<ul class="simple simple-toc-section">
104+
<li><a class="reference" href="#JavaVMAttachArgs"
105+
title="JavaVMAttachArgs = object
106+
version: jint
107+
name: cstring
108+
group: jobject">JavaVMAttachArgs</a></li>
109+
110+
</ul>
111+
</li>
112+
<li>
113+
<a class="reference reference-toplevel" href="#12" id="62">Procs</a>
114+
<ul class="simple simple-toc-section">
115+
<ul class="simple nested-toc-section">initializeJavaVM
116+
<li><a class="reference" href="#initializeJavaVM%2CJNIEnvPtr"
117+
title="initializeJavaVM(env: JNIEnvPtr)">initializeJavaVM(env: JNIEnvPtr)</a></li>
118+
119+
</ul>
120+
<ul class="simple nested-toc-section">jniErrorMessage
121+
<li><a class="reference" href="#jniErrorMessage%2Cjint"
122+
title="jniErrorMessage(err: jint): string">jniErrorMessage(err: jint): string</a></li>
123+
124+
</ul>
125+
<ul class="simple nested-toc-section">ok
126+
<li><a class="reference" href="#ok%2Cjint"
127+
title="ok(rc: jint)">ok(rc: jint)</a></li>
128+
129+
</ul>
130+
131+
</ul>
132+
</li>
133+
<li>
134+
<a class="reference reference-toplevel" href="#18" id="68">Templates</a>
135+
<ul class="simple simple-toc-section">
136+
<ul class="simple nested-toc-section">withJEnv
137+
<li><a class="reference" href="#withJEnv.t%2Cuntyped%2Cuntyped"
138+
title="withJEnv(env: untyped; body: untyped): untyped">withJEnv(env: untyped; body: untyped): untyped</a></li>
139+
140+
</ul>
141+
142+
</ul>
143+
</li>
144+
145+
</ul>
146+
147+
</div>
148+
149+
<div class="nine columns" id="content">
150+
<div id="tocRoot"></div>
151+
152+
<p class="module-desc"></p>
153+
<div class="section" id="7">
154+
<h1><a class="toc-backref" href="#7">Types</a></h1>
155+
<dl class="item">
156+
<div id="JavaVMAttachArgs">
157+
<dt><pre><a href="androidutil.html#JavaVMAttachArgs"><span class="Identifier">JavaVMAttachArgs</span></a> <span class="Other">=</span> <span class="Keyword">object</span>
158+
<span class="Identifier">version</span><span class="Other">:</span> <span class="Identifier">jint</span>
159+
<span class="Identifier">name</span><span class="Other">:</span> <span class="Identifier">cstring</span>
160+
<span class="Identifier">group</span><span class="Other">:</span> <span class="Identifier">jobject</span>
161+
</pre></dt>
162+
<dd>
163+
164+
165+
166+
</dd>
167+
</div>
168+
169+
</dl></div>
170+
<div class="section" id="12">
171+
<h1><a class="toc-backref" href="#12">Procs</a></h1>
172+
<dl class="item">
173+
<div id="initializeJavaVM,JNIEnvPtr">
174+
<dt><pre><span class="Keyword">proc</span> <a href="#initializeJavaVM%2CJNIEnvPtr"><span class="Identifier">initializeJavaVM</span></a><span class="Other">(</span><span class="Identifier">env</span><span class="Other">:</span> <span class="Identifier">JNIEnvPtr</span><span class="Other">)</span> {.<span><span class="Other pragmadots">...</span></span><span class="pragmawrap"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Identifier">Exception</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Identifier">RootEffect</span><span class="Other">]</span></span>.}</pre></dt>
175+
<dd>
176+
177+
Set up the global_JavaVM Call this before doing anything else in here.
178+
179+
</dd>
180+
</div>
181+
<div id="jniErrorMessage,jint">
182+
<dt><pre><span class="Keyword">proc</span> <a href="#jniErrorMessage%2Cjint"><span class="Identifier">jniErrorMessage</span></a><span class="Other">(</span><span class="Identifier">err</span><span class="Other">:</span> <span class="Identifier">jint</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">string</span> {.<span><span class="Other pragmadots">...</span></span><span class="pragmawrap"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span>.}</pre></dt>
183+
<dd>
184+
185+
Convert an error return code into a string
186+
187+
</dd>
188+
</div>
189+
<div id="ok,jint">
190+
<dt><pre><span class="Keyword">proc</span> <a href="#ok%2Cjint"><span class="Identifier">ok</span></a><span class="Other">(</span><span class="Identifier">rc</span><span class="Other">:</span> <span class="Identifier">jint</span><span class="Other">)</span> {.<span><span class="Other pragmadots">...</span></span><span class="pragmawrap"><span class="Identifier">raises</span><span class="Other">:</span> <span class="Other">[</span><span class="Identifier">ValueError</span><span class="Other">]</span><span class="Other">,</span> <span class="Identifier">tags</span><span class="Other">:</span> <span class="Other">[</span><span class="Other">]</span></span>.}</pre></dt>
191+
<dd>
192+
193+
194+
195+
</dd>
196+
</div>
197+
198+
</dl></div>
199+
<div class="section" id="18">
200+
<h1><a class="toc-backref" href="#18">Templates</a></h1>
201+
<dl class="item">
202+
<div id="withJEnv.t,untyped,untyped">
203+
<dt><pre><span class="Keyword">template</span> <a href="#withJEnv.t%2Cuntyped%2Cuntyped"><span class="Identifier">withJEnv</span></a><span class="Other">(</span><span class="Identifier">env</span><span class="Other">:</span> <span class="Identifier">untyped</span><span class="Other">;</span> <span class="Identifier">body</span><span class="Other">:</span> <span class="Identifier">untyped</span><span class="Other">)</span><span class="Other">:</span> <span class="Identifier">untyped</span></pre></dt>
204+
<dd>
205+
206+
207+
208+
</dd>
209+
</div>
210+
211+
</dl></div>
212+
213+
</div>
214+
</div>
215+
216+
<div class="row">
217+
<div class="twelve-columns footer">
218+
<span class="nim-sprite"></span>
219+
<br/>
220+
<small style="color: var(--hint);">Made with Nim. Generated: 2023-07-10 13:45:26 UTC</small>
221+
</div>
222+
</div>
223+
</div>
224+
</div>
225+
226+
</body>
227+
</html>

‎docs/androidutil.idx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
JavaVMAttachArgs androidutil.html#JavaVMAttachArgs androidutil: JavaVMAttachArgs
2+
jniErrorMessage androidutil.html#jniErrorMessage,jint androidutil: jniErrorMessage(err: jint): string
3+
ok androidutil.html#ok,jint androidutil: ok(rc: jint)
4+
initializeJavaVM androidutil.html#initializeJavaVM,JNIEnvPtr androidutil: initializeJavaVM(env: JNIEnvPtr)
5+
withJEnv androidutil.html#withJEnv.t,untyped,untyped androidutil: withJEnv(env: untyped; body: untyped): untyped

0 commit comments

Comments
 (0)