Skip to content

Commit dc48684

Browse files
authored
Merge pull request #120 from EthanLowenthal/colorpicker_codecompletion
Add colorpicker and codecompletion to editor
2 parents 86e53e8 + 4245e6c commit dc48684

8 files changed

+903
-1
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## ShaderToy extension changelog:
22

3+
- 0.13.215 (30-11-2020)
4+
5+
- Add code completion and color picker extentions to code editor
6+
37
- 0.13.201 (28-11-2020)
48

59
- Temporary fix for resoultion decrease. (doesn't change resoltion when entering fullscreen)

README.md

+18
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ Please add issue with description before PR.
7373

7474
- Shader preview (automatic generated image).
7575

76+
- **Code completion** for glsl keywords in the code editor.
77+
78+
- **Color picker** for any vec3 with r,g,b values in the code editor.
79+
7680
## Screenshots
7781

7882
### Controls
@@ -103,6 +107,18 @@ Please add issue with description before PR.
103107

104108
---
105109

110+
### Code editor
111+
112+
##### Color picker for any vec3 with r,g,b
113+
114+
![](./screenshots/color-picker.png)
115+
116+
##### Code completion for glsl keywords and code snippets
117+
118+
![](./screenshots/code-completion.png)
119+
120+
---
121+
106122
## Author / Contact:
107123

108124
[PatrykFalba (Patu)](http://patrykfalba.pl)
@@ -113,6 +129,8 @@ Please add issue with description before PR.
113129

114130
[cxw42](https://github.com/cxw42)
115131

132+
[Ethan Lowenthal](https://ethansawesomewebsite.tk/)
133+
116134
Render timing based on [shadertoy_gpu_timing.user.js](https://github.com/andrei-drexler/shadertoy-userscripts/blob/master/shadertoy_gpu_timing.user.js) by [Andrei Drexler](https://github.com/andrei-drexler)
117135

118136
## Beer? Sure.

0 commit comments

Comments
 (0)