sfml.js 1.0.0 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (313) hide show
  1. package/README.ja.md +10 -9
  2. package/README.ko.md +10 -9
  3. package/README.md +10 -9
  4. package/README.zh-CN.md +10 -9
  5. package/binding.gyp +23 -16
  6. package/dist/audio/effect-processor.js +9 -3
  7. package/dist/audio/input-sound-file.js +41 -15
  8. package/dist/audio/listener.js +33 -11
  9. package/dist/audio/music.js +41 -18
  10. package/dist/audio/output-sound-file.js +4 -2
  11. package/dist/audio/playback-device.js +11 -3
  12. package/dist/audio/sound-buffer-recorder.js +8 -5
  13. package/dist/audio/sound-buffer.js +40 -17
  14. package/dist/audio/sound-file-factory.js +21 -9
  15. package/dist/audio/sound-file-reader.js +21 -7
  16. package/dist/audio/sound-recorder.js +36 -15
  17. package/dist/audio/sound-source.js +117 -40
  18. package/dist/audio/sound-stream.js +14 -5
  19. package/dist/audio/sound.js +9 -4
  20. package/dist/audio/value.js +42 -16
  21. package/dist/graphics/blend-mode.js +2 -1
  22. package/dist/graphics/boolean-vector.d.ts +1 -2
  23. package/dist/graphics/boolean-vector.js +19 -9
  24. package/dist/graphics/color.js +2 -1
  25. package/dist/graphics/convex-shape.js +7 -3
  26. package/dist/graphics/font.js +52 -23
  27. package/dist/graphics/glsl-matrix.js +8 -3
  28. package/dist/graphics/glsl.js +47 -16
  29. package/dist/graphics/glyph.js +27 -10
  30. package/dist/graphics/image.js +30 -14
  31. package/dist/graphics/rect.js +15 -8
  32. package/dist/graphics/render-states.js +18 -9
  33. package/dist/graphics/render-target.js +49 -23
  34. package/dist/graphics/render-texture.js +24 -12
  35. package/dist/graphics/render-window.js +6 -3
  36. package/dist/graphics/shader.js +67 -32
  37. package/dist/graphics/shape.js +25 -13
  38. package/dist/graphics/sprite.js +19 -9
  39. package/dist/graphics/stencil-mode.js +10 -6
  40. package/dist/graphics/swap.js +2 -1
  41. package/dist/graphics/text.js +123 -48
  42. package/dist/graphics/texture.js +48 -24
  43. package/dist/graphics/transform.js +29 -13
  44. package/dist/graphics/transformable.js +2 -1
  45. package/dist/graphics/vertex-array.js +40 -18
  46. package/dist/graphics/vertex-buffer.js +39 -19
  47. package/dist/graphics/vertex.js +6 -3
  48. package/dist/graphics/view.js +30 -14
  49. package/dist/index.d.ts +4 -4
  50. package/dist/internal/audio-codec-registry.js +12 -6
  51. package/dist/internal/audio-input-stream.js +2 -1
  52. package/dist/internal/audio-music-pump.js +58 -24
  53. package/dist/internal/audio-recorder-session.js +17 -7
  54. package/dist/internal/audio-worker-session.js +28 -10
  55. package/dist/internal/audio-worker.js +40 -21
  56. package/dist/internal/glsl-value.d.ts +3 -1
  57. package/dist/internal/glsl-value.js +18 -8
  58. package/dist/internal/graphics-state.js +29 -15
  59. package/dist/internal/input-stream.d.ts +3 -1
  60. package/dist/internal/input-stream.js +16 -7
  61. package/dist/internal/numeric-properties.js +2 -1
  62. package/dist/internal/render-states.js +2 -1
  63. package/dist/internal/scalar.js +22 -13
  64. package/dist/internal/shaped-glyph.d.ts +3 -1
  65. package/dist/internal/shaped-glyph.js +12 -4
  66. package/dist/internal/struct-view.d.ts +3 -1
  67. package/dist/internal/struct-view.js +3 -1
  68. package/dist/internal/transformable.js +2 -1
  69. package/dist/network/common.js +23 -11
  70. package/dist/network/dns.js +25 -17
  71. package/dist/network/ftp.js +43 -18
  72. package/dist/network/http.js +126 -56
  73. package/dist/network/ip-address.js +50 -25
  74. package/dist/network/packet.js +63 -25
  75. package/dist/network/sftp.js +175 -74
  76. package/dist/network/socket-selector.js +28 -14
  77. package/dist/network/socket.js +71 -30
  78. package/dist/network/tcp-listener.js +42 -19
  79. package/dist/network/tcp-socket.js +111 -53
  80. package/dist/network/tls-material.js +2 -1
  81. package/dist/network/udp-socket.js +68 -33
  82. package/dist/system/angle.js +2 -1
  83. package/dist/system/clock.js +4 -2
  84. package/dist/system/err.js +5 -2
  85. package/dist/system/file-input-stream.js +8 -4
  86. package/dist/system/input-stream.js +6 -3
  87. package/dist/system/operators.d.ts +1 -1
  88. package/dist/system/operators.js +90 -50
  89. package/dist/system/sleep.js +4 -2
  90. package/dist/system/time.js +12 -6
  91. package/dist/system/vector2.js +6 -7
  92. package/dist/system/vector3.js +11 -6
  93. package/dist/window/clipboard.js +2 -1
  94. package/dist/window/context.js +10 -5
  95. package/dist/window/cursor.js +2 -1
  96. package/dist/window/event.js +9 -5
  97. package/dist/window/mouse.js +4 -2
  98. package/dist/window/video-mode.js +2 -1
  99. package/dist/window/window.js +19 -12
  100. package/native/addon.cc +25 -12
  101. package/native/audio-binding.cc +266 -126
  102. package/native/audio-codec-binding.cc +147 -77
  103. package/native/audio-device-binding.cc +76 -49
  104. package/native/audio-file-binding.cc +116 -67
  105. package/native/audio-recorder-binding.cc +147 -98
  106. package/native/audio-recorder.h +1 -1
  107. package/native/audio-state.h +53 -30
  108. package/native/audio-stream-binding.cc +148 -94
  109. package/native/audio-stream.h +5 -4
  110. package/native/audio-worker-binding.cc +163 -81
  111. package/native/audio-worker.h +35 -19
  112. package/native/batch-drawable.cc +29 -16
  113. package/native/batch-drawable.h +11 -8
  114. package/native/context-binding.cc +40 -27
  115. package/native/context-settings.h +15 -8
  116. package/native/deferred-delete.cc +9 -6
  117. package/native/deferred-delete.h +7 -8
  118. package/native/error-stream-binding.cc +42 -28
  119. package/native/font-binding.cc +89 -48
  120. package/native/graphics-binding.cc +122 -72
  121. package/native/graphics-state.h +50 -36
  122. package/native/image-binding.cc +38 -24
  123. package/native/image-state.h +26 -18
  124. package/native/input-binding.cc +42 -27
  125. package/native/render-window-binding.cc +38 -23
  126. package/native/shader-binding.cc +115 -50
  127. package/native/shape-binding.cc +94 -49
  128. package/native/shape-state.h +18 -9
  129. package/native/shaped-glyph-storage.h +9 -5
  130. package/native/stream-binding.cc +143 -117
  131. package/native/system-binding.cc +17 -12
  132. package/native/text-binding.cc +68 -35
  133. package/native/text-state.h +25 -18
  134. package/native/texture-binding.cc +42 -33
  135. package/native/texture-resource.h +20 -12
  136. package/native/time-value.h +3 -1
  137. package/native/transformable-binding.cc +12 -6
  138. package/native/transformable-state.h +6 -6
  139. package/native/value-binding.h +46 -28
  140. package/native/value-layout.h +10 -10
  141. package/native/values-binding.cc +29 -23
  142. package/native/vertex-binding.cc +18 -12
  143. package/native/vertex-buffer-binding.cc +38 -24
  144. package/native/vertex-storage.h +2 -2
  145. package/native/view-data.h +4 -3
  146. package/native/window-binding.cc +75 -45
  147. package/native/window-event.h +20 -11
  148. package/native/window-owner.h +15 -12
  149. package/package.json +40 -48
  150. package/src/audio/effect-processor.ts +9 -3
  151. package/src/audio/input-sound-file.ts +108 -36
  152. package/src/audio/listener.ts +39 -13
  153. package/src/audio/music.ts +112 -47
  154. package/src/audio/output-sound-file.ts +40 -11
  155. package/src/audio/playback-device.ts +23 -8
  156. package/src/audio/sound-buffer-recorder.ts +35 -13
  157. package/src/audio/sound-buffer.ts +166 -58
  158. package/src/audio/sound-file-factory.ts +127 -49
  159. package/src/audio/sound-file-reader.ts +49 -15
  160. package/src/audio/sound-recorder.ts +100 -34
  161. package/src/audio/sound-source.ts +142 -45
  162. package/src/audio/sound-stream.ts +15 -5
  163. package/src/audio/sound.ts +12 -4
  164. package/src/audio/value.ts +89 -26
  165. package/src/graphics/blend-mode.ts +3 -1
  166. package/src/graphics/boolean-vector.ts +56 -26
  167. package/src/graphics/color.ts +3 -1
  168. package/src/graphics/convex-shape.ts +10 -3
  169. package/src/graphics/font.ts +171 -50
  170. package/src/graphics/glsl-matrix.ts +9 -3
  171. package/src/graphics/glsl.ts +81 -35
  172. package/src/graphics/glyph.ts +67 -26
  173. package/src/graphics/image.ts +119 -45
  174. package/src/graphics/rect.ts +56 -24
  175. package/src/graphics/render-states.ts +31 -14
  176. package/src/graphics/render-target.ts +197 -81
  177. package/src/graphics/render-texture.ts +36 -12
  178. package/src/graphics/render-window.ts +9 -3
  179. package/src/graphics/shader.ts +186 -61
  180. package/src/graphics/shape.ts +93 -35
  181. package/src/graphics/sprite.ts +64 -25
  182. package/src/graphics/stencil-mode.ts +12 -6
  183. package/src/graphics/swap.ts +3 -2
  184. package/src/graphics/text.ts +229 -74
  185. package/src/graphics/texture.ts +180 -61
  186. package/src/graphics/transform.ts +132 -47
  187. package/src/graphics/transformable.ts +3 -1
  188. package/src/graphics/vertex-array.ts +87 -35
  189. package/src/graphics/vertex-buffer.ts +97 -33
  190. package/src/graphics/vertex.ts +9 -3
  191. package/src/graphics/view.ts +59 -21
  192. package/src/index.ts +101 -23
  193. package/src/internal/audio-codec-registry.ts +18 -6
  194. package/src/internal/audio-input-stream.ts +6 -2
  195. package/src/internal/audio-music-pump.ts +116 -41
  196. package/src/internal/audio-native.ts +249 -96
  197. package/src/internal/audio-recorder-session.ts +68 -24
  198. package/src/internal/audio-worker-session.ts +65 -21
  199. package/src/internal/audio-worker.ts +85 -41
  200. package/src/internal/glsl-value.ts +26 -11
  201. package/src/internal/graphics-state.ts +57 -20
  202. package/src/internal/input-stream.ts +23 -10
  203. package/src/internal/native.ts +252 -99
  204. package/src/internal/numeric-properties.ts +2 -1
  205. package/src/internal/render-states.ts +3 -1
  206. package/src/internal/scalar.ts +33 -14
  207. package/src/internal/shaped-glyph.ts +25 -12
  208. package/src/internal/struct-view.ts +40 -13
  209. package/src/internal/transformable.ts +3 -1
  210. package/src/network/common.ts +35 -11
  211. package/src/network/dns.ts +95 -38
  212. package/src/network/ftp.ts +129 -47
  213. package/src/network/http.ts +232 -77
  214. package/src/network/ip-address.ts +118 -48
  215. package/src/network/packet.ts +161 -54
  216. package/src/network/sftp.ts +498 -168
  217. package/src/network/socket-selector.ts +66 -26
  218. package/src/network/socket.ts +133 -46
  219. package/src/network/tcp-listener.ts +78 -29
  220. package/src/network/tcp-socket.ts +240 -95
  221. package/src/network/tls-material.ts +6 -2
  222. package/src/network/udp-socket.ts +147 -53
  223. package/src/system/angle.ts +3 -1
  224. package/src/system/clock.ts +12 -4
  225. package/src/system/err.ts +5 -2
  226. package/src/system/file-input-stream.ts +12 -4
  227. package/src/system/input-stream.ts +9 -3
  228. package/src/system/operators.ts +290 -115
  229. package/src/system/sleep.ts +6 -2
  230. package/src/system/time.ts +18 -6
  231. package/src/system/timeout-with-predicate.ts +19 -8
  232. package/src/system/vector2.ts +101 -49
  233. package/src/system/vector3.ts +85 -36
  234. package/src/window/clipboard.ts +3 -1
  235. package/src/window/context.ts +15 -5
  236. package/src/window/cursor.ts +3 -1
  237. package/src/window/event.ts +26 -12
  238. package/src/window/mouse.ts +6 -2
  239. package/src/window/video-mode.ts +3 -1
  240. package/src/window/window.ts +119 -37
  241. package/test/native/audio-probes.cc +74 -36
  242. package/test/native/deferred-delete-probes.cc +17 -11
  243. package/test/native/drawable-probes.cc +70 -36
  244. package/test/native/exception-probes.cc +14 -9
  245. package/test/native/image-probes.cc +20 -10
  246. package/test/native/matrix-probes.cc +8 -4
  247. package/test/native/network-oracle.cc +17 -11
  248. package/test/native/render-texture-probes.cc +33 -24
  249. package/test/native/shader-probes.cc +9 -9
  250. package/test/native/shape-probes.cc +37 -23
  251. package/test/native/sprite-probes.cc +41 -25
  252. package/test/native/system-probes.cc +58 -35
  253. package/test/native/text-probes.cc +77 -44
  254. package/test/native/texture-probes.cc +43 -26
  255. package/test/native/time-probes.cc +18 -12
  256. package/test/native/transform-probes.cc +15 -10
  257. package/test/native/transformable-probes.cc +23 -17
  258. package/test/native/value-oracle.h +9 -4
  259. package/test/native/value-probes.cc +31 -23
  260. package/test/native/vertex-array-probes.cc +22 -14
  261. package/test/native/vertex-buffer-probes.cc +28 -17
  262. package/test/native/view-probes.cc +29 -17
  263. package/test/native/window-probes.cc +66 -33
  264. package/tools/ensure-sfml.cjs +9 -0
  265. package/tools/generate-network-constants.cjs +11 -6
  266. package/tools/generate-window-constants.cjs +31 -12
  267. package/docs/README.ja.md +0 -30
  268. package/docs/README.ko.md +0 -30
  269. package/docs/README.md +0 -30
  270. package/docs/README.zh-CN.md +0 -30
  271. package/docs/api.ja.md +0 -84
  272. package/docs/api.ko.md +0 -84
  273. package/docs/api.md +0 -81
  274. package/docs/api.zh-CN.md +0 -81
  275. package/docs/audio.ja.md +0 -249
  276. package/docs/audio.ko.md +0 -251
  277. package/docs/audio.md +0 -252
  278. package/docs/audio.zh-CN.md +0 -252
  279. package/docs/concepts.ja.md +0 -130
  280. package/docs/concepts.ko.md +0 -130
  281. package/docs/concepts.md +0 -131
  282. package/docs/concepts.zh-CN.md +0 -131
  283. package/docs/development.ja.md +0 -144
  284. package/docs/development.ko.md +0 -144
  285. package/docs/development.md +0 -146
  286. package/docs/development.zh-CN.md +0 -146
  287. package/docs/getting-started.ja.md +0 -154
  288. package/docs/getting-started.ko.md +0 -154
  289. package/docs/getting-started.md +0 -156
  290. package/docs/getting-started.zh-CN.md +0 -156
  291. package/docs/graphics.ja.md +0 -256
  292. package/docs/graphics.ko.md +0 -254
  293. package/docs/graphics.md +0 -255
  294. package/docs/graphics.zh-CN.md +0 -257
  295. package/docs/network.ja.md +0 -214
  296. package/docs/network.ko.md +0 -216
  297. package/docs/network.md +0 -218
  298. package/docs/network.zh-CN.md +0 -218
  299. package/docs/system.ja.md +0 -169
  300. package/docs/system.ko.md +0 -171
  301. package/docs/system.md +0 -173
  302. package/docs/system.zh-CN.md +0 -173
  303. package/docs/window.ja.md +0 -138
  304. package/docs/window.ko.md +0 -140
  305. package/docs/window.md +0 -141
  306. package/docs/window.zh-CN.md +0 -141
  307. package/native/exception-boundary.h +0 -97
  308. package/native/numeric-fields.h +0 -96
  309. package/native/shared-handle.h +0 -107
  310. package/test/tsconfig.json +0 -8
  311. package/tools/configure-lsp.cjs +0 -23
  312. package/tools/lib_downloader.cjs +0 -92
  313. package/tools/lib_downloader_urls.cjs +0 -23
@@ -1,10 +1,10 @@
1
- #include "font-state.h"
1
+ #include <filesystem>
2
+
2
3
  #include "exception-boundary.h"
4
+ #include "font-state.h"
3
5
  #include "image-state.h"
4
6
  #include "value-binding.h"
5
7
 
6
- #include <filesystem>
7
-
8
8
  namespace sfmljs {
9
9
  SFMLJS_MEMBER(FontSmooth, sf::Font, bool, m_isSmooth);
10
10
  } // namespace sfmljs
@@ -17,12 +17,17 @@ using DataHandle = sfmljs::SharedHandle<FontData>;
17
17
 
18
18
  v8::Local<v8::Object> MapFont(const std::shared_ptr<FontData>& owner) {
19
19
  const auto& data = owner->font.getInfo();
20
- auto result = sfmljs::NumericFields()
21
- .Add("id", data.id).Add("hasKerning", data.hasKerning)
22
- .Add("hasVerticalMetrics", data.hasVerticalMetrics)
23
- .Add("smooth", sfmljs::Field<sfmljs::FontSmooth>(owner->font)).Map(owner);
24
- Nan::Set(result, Nan::New("family").ToLocalChecked(),
25
- Nan::New(data.family).ToLocalChecked()).FromJust();
20
+ auto result =
21
+ sfmljs::NumericFields()
22
+ .Add("id", data.id)
23
+ .Add("hasKerning", data.hasKerning)
24
+ .Add("hasVerticalMetrics", data.hasVerticalMetrics)
25
+ .Add("smooth", sfmljs::Field<sfmljs::FontSmooth>(owner->font))
26
+ .Map(owner);
27
+ Nan::Set(result,
28
+ Nan::New("family").ToLocalChecked(),
29
+ Nan::New(data.family).ToLocalChecked())
30
+ .FromJust();
26
31
  return result;
27
32
  }
28
33
 
@@ -40,25 +45,32 @@ NAN_METHOD(CreateSfmlFont) {
40
45
  auto state = std::make_shared<sfmljs::FontState>(
41
46
  sfmljs::FontState{context->owner(), std::move(data)});
42
47
  auto result = MapFont(state->current);
43
- Nan::Set(result, Nan::New("handle").ToLocalChecked(),
44
- FontHandle::Create(state)).FromJust();
48
+ Nan::Set(
49
+ result, Nan::New("handle").ToLocalChecked(), FontHandle::Create(state))
50
+ .FromJust();
45
51
  info.GetReturnValue().Set(result);
46
- } catch (const std::exception& error) { sfmljs::ThrowError(error.what()); }
52
+ } catch (const std::exception& error) {
53
+ sfmljs::ThrowError(error.what());
54
+ }
47
55
  }
48
56
 
49
57
  class OpenWorker final : public sfmljs::AsyncWorker {
50
58
  public:
51
- OpenWorker(Nan::Callback* callback, std::shared_ptr<FontData> data,
59
+ OpenWorker(Nan::Callback* callback,
60
+ std::shared_ptr<FontData> data,
52
61
  std::string path)
53
62
  : sfmljs::AsyncWorker(callback, "sfml:Font"),
54
- data_(std::move(data)), path_(std::move(path)) {}
63
+ data_(std::move(data)),
64
+ path_(std::move(path)) {}
55
65
  void ExecuteWork() override {
56
66
  try {
57
- ok_ = data_->bytes
58
- ? data_->font.openFromMemory(data_->bytes->data(), data_->bytes->size())
59
- : data_->font.openFromFile(std::filesystem::path(
60
- std::u8string(path_.begin(), path_.end())));
61
- } catch (const std::exception& error) { SetErrorMessage(error.what()); }
67
+ ok_ = data_->bytes ? data_->font.openFromMemory(data_->bytes->data(),
68
+ data_->bytes->size())
69
+ : data_->font.openFromFile(std::filesystem::path(
70
+ std::u8string(path_.begin(), path_.end())));
71
+ } catch (const std::exception& error) {
72
+ SetErrorMessage(error.what());
73
+ }
62
74
  }
63
75
  void CompleteWork() override {
64
76
  Nan::HandleScope scope;
@@ -67,6 +79,7 @@ class OpenWorker final : public sfmljs::AsyncWorker {
67
79
  v8::Local<v8::Value> args[] = {Nan::Null(), result};
68
80
  callback->Call(2, args, async_resource);
69
81
  }
82
+
70
83
  private:
71
84
  std::shared_ptr<FontData> data_;
72
85
  std::string path_;
@@ -87,14 +100,16 @@ NAN_METHOD(OpenFont) {
87
100
  } else {
88
101
  std::span<const std::uint8_t> bytes;
89
102
  if (!sfmljs::ReadImageBytes(info[0], bytes)) return;
90
- data->bytes = std::make_shared<std::vector<std::uint8_t>>(
91
- bytes.begin(), bytes.end());
103
+ data->bytes = std::make_shared<std::vector<std::uint8_t>>(bytes.begin(),
104
+ bytes.end());
92
105
  }
93
106
  auto callback = std::make_unique<Nan::Callback>(info[1].As<v8::Function>());
94
107
  auto worker = std::make_unique<OpenWorker>(callback.get(), data, path);
95
108
  callback.release();
96
109
  Nan::AsyncQueueWorker(worker.release());
97
- } catch (const std::exception& error) { sfmljs::ThrowError(error.what()); }
110
+ } catch (const std::exception& error) {
111
+ sfmljs::ThrowError(error.what());
112
+ }
98
113
  }
99
114
 
100
115
  NAN_METHOD(CommitFont) {
@@ -110,21 +125,27 @@ NAN_METHOD(CommitFont) {
110
125
  NAN_METHOD(GetFontGlyph) {
111
126
  auto* state = FontHandle::From(info[0]);
112
127
  if (!state) return;
113
- if (!info[1]->IsUint32() || !info[2]->IsUint32() ||
114
- !info[3]->IsBoolean() || !info[4]->IsNumber() || !info[5]->IsBoolean()) {
115
- return Nan::ThrowTypeError("Expected glyph, size, bold, outline and ID flag");
128
+ if (!info[1]->IsUint32() || !info[2]->IsUint32() || !info[3]->IsBoolean() ||
129
+ !info[4]->IsNumber() || !info[5]->IsBoolean()) {
130
+ return Nan::ThrowTypeError(
131
+ "Expected glyph, size, bold, outline and ID flag");
116
132
  }
117
133
  try {
118
134
  const auto& font = state->owner()->current->font;
119
135
  const auto id = Nan::To<std::uint32_t>(info[1]).FromJust();
120
136
  const auto size = Nan::To<unsigned>(info[2]).FromJust();
121
- const auto outline = static_cast<float>(Nan::To<double>(info[4]).FromJust());
122
- const auto& glyph = info[5]->IsTrue()
123
- ? font.getGlyphById(id, size, info[3]->IsTrue(), outline)
124
- : font.getGlyph(static_cast<char32_t>(id), size, info[3]->IsTrue(), outline);
137
+ const auto outline =
138
+ static_cast<float>(Nan::To<double>(info[4]).FromJust());
139
+ const auto& glyph =
140
+ info[5]->IsTrue()
141
+ ? font.getGlyphById(id, size, info[3]->IsTrue(), outline)
142
+ : font.getGlyph(
143
+ static_cast<char32_t>(id), size, info[3]->IsTrue(), outline);
125
144
  // Independent value: JS cannot corrupt the font's glyph cache.
126
145
  sfmljs::values::ReturnMapped(info, std::make_shared<sf::Glyph>(glyph));
127
- } catch (const std::exception& error) { sfmljs::ThrowError(error.what()); }
146
+ } catch (const std::exception& error) {
147
+ sfmljs::ThrowError(error.what());
148
+ }
128
149
  }
129
150
 
130
151
  NAN_METHOD(FontMetric) {
@@ -137,23 +158,37 @@ NAN_METHOD(FontMetric) {
137
158
  const auto value = Nan::To<unsigned>(info[2]).FromJust();
138
159
  float result{};
139
160
  switch (Nan::To<unsigned>(info[1]).FromJust()) {
140
- case 0: result = font.getAscent(value); break;
141
- case 1: result = font.getDescent(value); break;
142
- case 2: result = font.getLineSpacing(value); break;
143
- case 3: result = font.getUnderlinePosition(value); break;
144
- case 4: result = font.getUnderlineThickness(value); break;
161
+ case 0:
162
+ result = font.getAscent(value);
163
+ break;
164
+ case 1:
165
+ result = font.getDescent(value);
166
+ break;
167
+ case 2:
168
+ result = font.getLineSpacing(value);
169
+ break;
170
+ case 3:
171
+ result = font.getUnderlinePosition(value);
172
+ break;
173
+ case 4:
174
+ result = font.getUnderlineThickness(value);
175
+ break;
145
176
  case 5:
146
177
  info.GetReturnValue().Set(font.hasGlyph(static_cast<char32_t>(value)));
147
178
  return;
148
179
  case 6:
149
- if (!info[3]->IsUint32() || !info[4]->IsUint32() || !info[5]->IsBoolean()) {
180
+ if (!info[3]->IsUint32() || !info[4]->IsUint32() ||
181
+ !info[5]->IsBoolean()) {
150
182
  return Nan::ThrowTypeError("Expected kerning arguments");
151
183
  }
152
- result = font.getKerning(static_cast<char32_t>(value),
184
+ result = font.getKerning(
185
+ static_cast<char32_t>(value),
153
186
  static_cast<char32_t>(Nan::To<unsigned>(info[3]).FromJust()),
154
- Nan::To<unsigned>(info[4]).FromJust(), info[5]->IsTrue());
187
+ Nan::To<unsigned>(info[4]).FromJust(),
188
+ info[5]->IsTrue());
155
189
  break;
156
- default: return Nan::ThrowRangeError("Invalid font metric");
190
+ default:
191
+ return Nan::ThrowRangeError("Invalid font metric");
157
192
  }
158
193
  info.GetReturnValue().Set(Nan::New(result));
159
194
  }
@@ -168,24 +203,30 @@ NAN_METHOD(SetFontSmooth) {
168
203
  NAN_METHOD(GetFontTexture) {
169
204
  auto* state = FontHandle::From(info[0]);
170
205
  if (!state) return;
171
- if (!info[1]->IsUint32()) return Nan::ThrowTypeError("Expected character size");
206
+ if (!info[1]->IsUint32())
207
+ return Nan::ThrowTypeError("Expected character size");
172
208
  try {
173
209
  auto context = state->owner()->context;
174
210
  auto font = state->owner()->current;
175
- const auto& texture = font->font.getTexture(Nan::To<unsigned>(info[1]).FromJust());
211
+ const auto& texture =
212
+ font->font.getTexture(Nan::To<unsigned>(info[1]).FromJust());
176
213
  const auto id = context->nextId++;
177
- auto atlas = sfmljs::MakeThreadOwned<sfmljs::FontAtlas>(
178
- context, font, id);
214
+ auto atlas = sfmljs::MakeThreadOwned<sfmljs::FontAtlas>(context, font, id);
179
215
  auto alias = std::shared_ptr<const sf::Texture>(atlas, &texture);
180
216
  context->textures.emplace(id, alias);
181
217
  auto result = Nan::New<v8::Object>();
182
- Nan::Set(result, Nan::New("info").ToLocalChecked(),
183
- sfmljs::MapTexture(alias)).FromJust();
184
- Nan::Set(result, Nan::New("handle").ToLocalChecked(),
185
- sfmljs::SharedHandle<const sf::Texture>::Create(alias)).FromJust();
218
+ Nan::Set(
219
+ result, Nan::New("info").ToLocalChecked(), sfmljs::MapTexture(alias))
220
+ .FromJust();
221
+ Nan::Set(result,
222
+ Nan::New("handle").ToLocalChecked(),
223
+ sfmljs::SharedHandle<const sf::Texture>::Create(alias))
224
+ .FromJust();
186
225
  Nan::Set(result, Nan::New("id").ToLocalChecked(), Nan::New(id)).FromJust();
187
226
  info.GetReturnValue().Set(result);
188
- } catch (const std::exception& error) { sfmljs::ThrowError(error.what()); }
227
+ } catch (const std::exception& error) {
228
+ sfmljs::ThrowError(error.what());
229
+ }
189
230
  }
190
231
 
191
232
  NAN_METHOD(GetTextureInfo) {
@@ -1,14 +1,14 @@
1
1
  #include <nan.h>
2
- #include <SFML/Graphics/Image.hpp>
3
-
4
- #include "graphics-state.h"
5
- #include "exception-boundary.h"
6
- #include "context-settings.h"
7
- #include "shared-handle.h"
8
2
 
9
3
  #include <exception>
10
4
  #include <limits>
11
5
 
6
+ #include "context-settings.h"
7
+ #include "exception-boundary.h"
8
+ #include "graphics-state.h"
9
+ #include "shared-handle.h"
10
+ #include <SFML/Graphics/Image.hpp>
11
+
12
12
  namespace {
13
13
 
14
14
  using Context = sfmljs::GraphicsContext;
@@ -16,8 +16,9 @@ using Sprite = sfmljs::SpriteState;
16
16
  using Target = sfmljs::RenderTextureState;
17
17
  using sfmljs::SharedHandle;
18
18
 
19
- bool ReadSize(v8::Local<v8::Value> x, v8::Local<v8::Value> y,
20
- sf::Vector2u& size) {
19
+ bool ReadSize(v8::Local<v8::Value> x,
20
+ v8::Local<v8::Value> y,
21
+ sf::Vector2u& size) { // NOLINT(runtime/references)
21
22
  if (!x->IsUint32() || !y->IsUint32()) {
22
23
  Nan::ThrowRangeError("Expected positive integer dimensions");
23
24
  return false;
@@ -36,8 +37,10 @@ NAN_METHOD(CreateGraphicsContext) {
36
37
  SharedHandle<Context>::Create(sfmljs::MakeThreadOwned<Context>()));
37
38
  }
38
39
 
39
- bool ReadTextureId(const Context& context, const std::shared_ptr<const sf::Texture>& texture,
40
- v8::Local<v8::Value> input, std::uint32_t& id) {
40
+ bool ReadTextureId(const Context& context,
41
+ const std::shared_ptr<const sf::Texture>& texture,
42
+ v8::Local<v8::Value> input,
43
+ std::uint32_t& id) { // NOLINT(runtime/references)
41
44
  if (!input->IsUint32()) {
42
45
  Nan::ThrowTypeError("Expected a texture ID");
43
46
  return false;
@@ -65,21 +68,33 @@ NAN_METHOD(CreateSprite) {
65
68
  context->owner(), texture, context->owner()->nextId++, textureId);
66
69
  context->owner()->sprites.emplace(object->id, object);
67
70
  auto result = Nan::New<v8::Object>();
68
- Nan::Set(result, Nan::New("handle").ToLocalChecked(),
69
- SharedHandle<Sprite>::Create(object)).FromJust();
70
- Nan::Set(result, Nan::New("id").ToLocalChecked(),
71
- Nan::New(object->id)).FromJust();
71
+ Nan::Set(result,
72
+ Nan::New("handle").ToLocalChecked(),
73
+ SharedHandle<Sprite>::Create(object))
74
+ .FromJust();
75
+ Nan::Set(result, Nan::New("id").ToLocalChecked(), Nan::New(object->id))
76
+ .FromJust();
72
77
  // The adjusted base pointer and sprite handle share one control block.
73
78
  const auto transformable = std::shared_ptr<sfmljs::TransformableState>(
74
79
  object, static_cast<sfmljs::TransformableState*>(object.get()));
75
- Nan::Set(result, Nan::New("transformable").ToLocalChecked(),
76
- sfmljs::TransformableHandle(transformable)).FromJust();
77
- Nan::Set(result, Nan::New("buffer").ToLocalChecked(),
78
- sfmljs::MapShared(info.GetIsolate(), object, object->values.data(),
79
- sizeof(object->values))).FromJust();
80
- Nan::Set(result, Nan::New("appearance").ToLocalChecked(),
81
- sfmljs::MapShared(info.GetIsolate(), object, &object->appearance,
82
- sizeof(object->appearance))).FromJust();
80
+ Nan::Set(result,
81
+ Nan::New("transformable").ToLocalChecked(),
82
+ sfmljs::TransformableHandle(transformable))
83
+ .FromJust();
84
+ Nan::Set(result,
85
+ Nan::New("buffer").ToLocalChecked(),
86
+ sfmljs::MapShared(info.GetIsolate(),
87
+ object,
88
+ object->values.data(),
89
+ sizeof(object->values)))
90
+ .FromJust();
91
+ Nan::Set(result,
92
+ Nan::New("appearance").ToLocalChecked(),
93
+ sfmljs::MapShared(info.GetIsolate(),
94
+ object,
95
+ &object->appearance,
96
+ sizeof(object->appearance)))
97
+ .FromJust();
83
98
  info.GetReturnValue().Set(result);
84
99
  }
85
100
 
@@ -102,11 +117,16 @@ NAN_METHOD(SpriteTextureRect) {
102
117
  auto rectangle = std::shared_ptr<sf::IntRect>(
103
118
  sprite->owner(), &sprite->owner()->appearance.rectangle);
104
119
  auto result = Nan::New<v8::Object>();
105
- Nan::Set(result, Nan::New("handle").ToLocalChecked(),
106
- SharedHandle<sf::IntRect>::Create(rectangle)).FromJust();
107
- Nan::Set(result, Nan::New("buffer").ToLocalChecked(),
108
- sfmljs::MapShared(info.GetIsolate(), rectangle, rectangle.get(),
109
- sizeof(sf::IntRect))).FromJust();
120
+ Nan::Set(result,
121
+ Nan::New("handle").ToLocalChecked(),
122
+ SharedHandle<sf::IntRect>::Create(rectangle))
123
+ .FromJust();
124
+ Nan::Set(
125
+ result,
126
+ Nan::New("buffer").ToLocalChecked(),
127
+ sfmljs::MapShared(
128
+ info.GetIsolate(), rectangle, rectangle.get(), sizeof(sf::IntRect)))
129
+ .FromJust();
110
130
  info.GetReturnValue().Set(result);
111
131
  }
112
132
 
@@ -125,17 +145,26 @@ NAN_METHOD(CreateRenderTexture) {
125
145
  return sfmljs::ThrowError("SFML could not create the render texture");
126
146
  }
127
147
  auto result = Nan::New<v8::Object>();
128
- Nan::Set(result, Nan::New("handle").ToLocalChecked(),
129
- SharedHandle<Target>::Create(target)).FromJust();
148
+ Nan::Set(result,
149
+ Nan::New("handle").ToLocalChecked(),
150
+ SharedHandle<Target>::Create(target))
151
+ .FromJust();
130
152
  const auto commands = target->batch.Commands();
131
- Nan::Set(result, Nan::New("buffer").ToLocalChecked(),
132
- sfmljs::MapShared(info.GetIsolate(), target, commands.data(),
133
- commands.size_bytes())).FromJust();
134
- Nan::Set(result, Nan::New("info").ToLocalChecked(),
153
+ Nan::Set(
154
+ result,
155
+ Nan::New("buffer").ToLocalChecked(),
156
+ sfmljs::MapShared(
157
+ info.GetIsolate(), target, commands.data(), commands.size_bytes()))
158
+ .FromJust();
159
+ Nan::Set(result,
160
+ Nan::New("info").ToLocalChecked(),
135
161
  sfmljs::MapTexture(std::shared_ptr<const sf::Texture>(
136
- target, &target->target.getTexture()))).FromJust();
137
- Nan::Set(result, Nan::New("targetInfo").ToLocalChecked(),
138
- sfmljs::NumericFields().Add("sRgb", target->targetSrgb).Map(target))
162
+ target, &target->target.getTexture())))
163
+ .FromJust();
164
+ Nan::Set(
165
+ result,
166
+ Nan::New("targetInfo").ToLocalChecked(),
167
+ sfmljs::NumericFields().Add("sRgb", target->targetSrgb).Map(target))
139
168
  .FromJust();
140
169
  info.GetReturnValue().Set(result);
141
170
  } catch (const std::exception& error) {
@@ -163,8 +192,8 @@ NAN_METHOD(ResizeRenderTexture) {
163
192
  }
164
193
 
165
194
  NAN_METHOD(GetMaximumRenderTextureAntiAliasingLevel) {
166
- info.GetReturnValue().Set(Nan::New(
167
- sf::RenderTexture::getMaximumAntiAliasingLevel()));
195
+ info.GetReturnValue().Set(
196
+ Nan::New(sf::RenderTexture::getMaximumAntiAliasingLevel()));
168
197
  }
169
198
 
170
199
  template <bool Smooth>
@@ -172,21 +201,24 @@ NAN_METHOD(SetRenderTextureSampling) {
172
201
  auto* handle = SharedHandle<Target>::From(info[0]);
173
202
  if (!handle) return;
174
203
  if (!info[1]->IsBoolean()) return Nan::ThrowTypeError("Expected a boolean");
175
- if constexpr (Smooth) handle->owner()->target.setSmooth(info[1]->IsTrue());
176
- else handle->owner()->target.setRepeated(info[1]->IsTrue());
204
+ if constexpr (Smooth)
205
+ handle->owner()->target.setSmooth(info[1]->IsTrue());
206
+ else
207
+ handle->owner()->target.setRepeated(info[1]->IsTrue());
177
208
  }
178
209
 
179
210
  NAN_METHOD(GenerateRenderTextureMipmap) {
180
211
  auto* handle = SharedHandle<Target>::From(info[0]);
181
- if (handle) info.GetReturnValue().Set(
182
- handle->owner()->target.generateMipmap());
212
+ if (handle)
213
+ info.GetReturnValue().Set(handle->owner()->target.generateMipmap());
183
214
  }
184
215
 
185
216
  NAN_METHOD(SetRenderTextureActive) {
186
217
  auto* handle = SharedHandle<Target>::From(info[0]);
187
218
  if (!handle) return;
188
219
  if (!info[1]->IsBoolean()) return Nan::ThrowTypeError("Expected a boolean");
189
- info.GetReturnValue().Set(handle->owner()->target.setActive(info[1]->IsTrue()));
220
+ info.GetReturnValue().Set(
221
+ handle->owner()->target.setActive(info[1]->IsTrue()));
190
222
  }
191
223
 
192
224
  NAN_METHOD(ChangeRenderTextureGLStates) {
@@ -198,18 +230,23 @@ NAN_METHOD(ChangeRenderTextureGLStates) {
198
230
  auto& state = *handle->owner();
199
231
  if (!state.initialized) return;
200
232
  switch (Nan::To<std::uint32_t>(info[1]).FromJust()) {
201
- case 0: state.target.pushGLStates(); break;
202
- case 1: state.target.popGLStates(); break;
203
- case 2: state.target.resetGLStates(); break;
233
+ case 0:
234
+ state.target.pushGLStates();
235
+ break;
236
+ case 1:
237
+ state.target.popGLStates();
238
+ break;
239
+ case 2:
240
+ state.target.resetGLStates();
241
+ break;
204
242
  }
205
243
  }
206
244
 
207
245
  NAN_METHOD(SubmitRenderTexture) {
208
246
  auto* target = SharedHandle<Target>::From(info[0]);
209
247
  if (!target) return;
210
- if (!info[1]->IsUint32() ||
211
- Nan::To<std::uint32_t>(info[1]).FromJust() >
212
- target->owner()->batch.Commands().size()) {
248
+ if (!info[1]->IsUint32() || Nan::To<std::uint32_t>(info[1]).FromJust() >
249
+ target->owner()->batch.Commands().size()) {
213
250
  return Nan::ThrowRangeError("Invalid draw command count");
214
251
  }
215
252
  if (!info[2]->IsBoolean()) {
@@ -237,16 +274,19 @@ NAN_METHOD(GetRenderTextureTexture) {
237
274
  }
238
275
  owner->textureId = owner->context->nextId++;
239
276
  }
240
- const auto texture = std::shared_ptr<const sf::Texture>(
241
- owner, &owner->target.getTexture());
277
+ const auto texture =
278
+ std::shared_ptr<const sf::Texture>(owner, &owner->target.getTexture());
242
279
  owner->context->textures.insert_or_assign(owner->textureId, texture);
243
280
  auto result = Nan::New<v8::Object>();
244
- Nan::Set(result, Nan::New("info").ToLocalChecked(),
245
- sfmljs::MapTexture(texture)).FromJust();
246
- Nan::Set(result, Nan::New("id").ToLocalChecked(),
247
- Nan::New(owner->textureId)).FromJust();
248
- Nan::Set(result, Nan::New("handle").ToLocalChecked(),
249
- SharedHandle<const sf::Texture>::Create(texture)).FromJust();
281
+ Nan::Set(
282
+ result, Nan::New("info").ToLocalChecked(), sfmljs::MapTexture(texture))
283
+ .FromJust();
284
+ Nan::Set(result, Nan::New("id").ToLocalChecked(), Nan::New(owner->textureId))
285
+ .FromJust();
286
+ Nan::Set(result,
287
+ Nan::New("handle").ToLocalChecked(),
288
+ SharedHandle<const sf::Texture>::Create(texture))
289
+ .FromJust();
250
290
  info.GetReturnValue().Set(result);
251
291
  }
252
292
 
@@ -260,10 +300,13 @@ NAN_METHOD(AllocateRenderTextureVertices) {
260
300
  try {
261
301
  const auto storage = target->owner()->batch.AllocateVertices(
262
302
  Nan::To<std::uint32_t>(info[1]).FromJust());
263
- info.GetReturnValue().Set(storage->empty()
264
- ? v8::ArrayBuffer::New(info.GetIsolate(), 0)
265
- : sfmljs::MapShared(info.GetIsolate(), storage, storage->data(),
266
- storage->size() * sizeof(sf::Vertex)));
303
+ info.GetReturnValue().Set(
304
+ storage->empty()
305
+ ? v8::ArrayBuffer::New(info.GetIsolate(), 0)
306
+ : sfmljs::MapShared(info.GetIsolate(),
307
+ storage,
308
+ storage->data(),
309
+ storage->size() * sizeof(sf::Vertex)));
267
310
  } catch (const std::exception& error) {
268
311
  sfmljs::ThrowError(error.what());
269
312
  }
@@ -274,8 +317,8 @@ NAN_METHOD(OpenRenderTexturePreview) {
274
317
  if (!target) return;
275
318
  auto preview = sfmljs::MakeThreadOwned<sfmljs::PreviewWindow>();
276
319
  preview->window.create(sf::VideoMode(target->owner()->target.getSize()),
277
- "sfml.js | Shared-memory sprite demo | Esc closes",
278
- sf::Style::Titlebar | sf::Style::Close);
320
+ "sfml.js | Shared-memory sprite demo | Esc closes",
321
+ sf::Style::Titlebar | sf::Style::Close);
279
322
  if (!preview->window.isOpen()) {
280
323
  return sfmljs::ThrowError("SFML could not open the preview window");
281
324
  }
@@ -298,9 +341,10 @@ NAN_METHOD(ReadRenderTexturePixels) {
298
341
  if (bytes > std::numeric_limits<std::uint32_t>::max()) {
299
342
  return Nan::ThrowRangeError("Image too large for the readback probe");
300
343
  }
301
- info.GetReturnValue().Set(Nan::CopyBuffer(
302
- reinterpret_cast<const char*>(image.getPixelsPtr()),
303
- static_cast<std::uint32_t>(bytes)).ToLocalChecked());
344
+ info.GetReturnValue().Set(
345
+ Nan::CopyBuffer(reinterpret_cast<const char*>(image.getPixelsPtr()),
346
+ static_cast<std::uint32_t>(bytes))
347
+ .ToLocalChecked());
304
348
  }
305
349
 
306
350
  NAN_METHOD(ReadSpritePosition) {
@@ -324,15 +368,21 @@ NAN_MODULE_INIT(InitializeGraphics) {
324
368
  sfmljs::SetMethod<ResizeRenderTexture>(target, "resizeRenderTexture");
325
369
  sfmljs::SetMethod<GetMaximumRenderTextureAntiAliasingLevel>(
326
370
  target, "getMaximumRenderTextureAntiAliasingLevel");
327
- sfmljs::SetMethod<SetRenderTextureSampling<true>>(target, "setRenderTextureSmooth");
328
- sfmljs::SetMethod<SetRenderTextureSampling<false>>(target, "setRenderTextureRepeated");
329
- sfmljs::SetMethod<GenerateRenderTextureMipmap>(target, "generateRenderTextureMipmap");
371
+ sfmljs::SetMethod<SetRenderTextureSampling<true>>(target,
372
+ "setRenderTextureSmooth");
373
+ sfmljs::SetMethod<SetRenderTextureSampling<false>>(
374
+ target, "setRenderTextureRepeated");
375
+ sfmljs::SetMethod<GenerateRenderTextureMipmap>(target,
376
+ "generateRenderTextureMipmap");
330
377
  sfmljs::SetMethod<SetRenderTextureActive>(target, "setRenderTextureActive");
331
- sfmljs::SetMethod<ChangeRenderTextureGLStates>(target, "changeRenderTextureGLStates");
378
+ sfmljs::SetMethod<ChangeRenderTextureGLStates>(target,
379
+ "changeRenderTextureGLStates");
332
380
  sfmljs::SetMethod<SubmitRenderTexture>(target, "submitRenderTexture");
333
381
  sfmljs::SetMethod<GetRenderTextureTexture>(target, "getRenderTextureTexture");
334
- sfmljs::SetMethod<AllocateRenderTextureVertices>(target, "allocateRenderTextureVertices");
335
- sfmljs::SetMethod<OpenRenderTexturePreview>(target, "openRenderTexturePreview");
382
+ sfmljs::SetMethod<AllocateRenderTextureVertices>(
383
+ target, "allocateRenderTextureVertices");
384
+ sfmljs::SetMethod<OpenRenderTexturePreview>(target,
385
+ "openRenderTexturePreview");
336
386
  sfmljs::SetMethod<ReadRenderTexturePixels>(target, "readRenderTexturePixels");
337
387
  sfmljs::SetMethod<ReadSpritePosition>(target, "readSpritePosition");
338
388
  }