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.
- package/README.ja.md +10 -9
- package/README.ko.md +10 -9
- package/README.md +10 -9
- package/README.zh-CN.md +10 -9
- package/binding.gyp +23 -16
- package/dist/audio/effect-processor.js +9 -3
- package/dist/audio/input-sound-file.js +41 -15
- package/dist/audio/listener.js +33 -11
- package/dist/audio/music.js +41 -18
- package/dist/audio/output-sound-file.js +4 -2
- package/dist/audio/playback-device.js +11 -3
- package/dist/audio/sound-buffer-recorder.js +8 -5
- package/dist/audio/sound-buffer.js +40 -17
- package/dist/audio/sound-file-factory.js +21 -9
- package/dist/audio/sound-file-reader.js +21 -7
- package/dist/audio/sound-recorder.js +36 -15
- package/dist/audio/sound-source.js +117 -40
- package/dist/audio/sound-stream.js +14 -5
- package/dist/audio/sound.js +9 -4
- package/dist/audio/value.js +42 -16
- package/dist/graphics/blend-mode.js +2 -1
- package/dist/graphics/boolean-vector.d.ts +1 -2
- package/dist/graphics/boolean-vector.js +19 -9
- package/dist/graphics/color.js +2 -1
- package/dist/graphics/convex-shape.js +7 -3
- package/dist/graphics/font.js +52 -23
- package/dist/graphics/glsl-matrix.js +8 -3
- package/dist/graphics/glsl.js +47 -16
- package/dist/graphics/glyph.js +27 -10
- package/dist/graphics/image.js +30 -14
- package/dist/graphics/rect.js +15 -8
- package/dist/graphics/render-states.js +18 -9
- package/dist/graphics/render-target.js +49 -23
- package/dist/graphics/render-texture.js +24 -12
- package/dist/graphics/render-window.js +6 -3
- package/dist/graphics/shader.js +67 -32
- package/dist/graphics/shape.js +25 -13
- package/dist/graphics/sprite.js +19 -9
- package/dist/graphics/stencil-mode.js +10 -6
- package/dist/graphics/swap.js +2 -1
- package/dist/graphics/text.js +123 -48
- package/dist/graphics/texture.js +48 -24
- package/dist/graphics/transform.js +29 -13
- package/dist/graphics/transformable.js +2 -1
- package/dist/graphics/vertex-array.js +40 -18
- package/dist/graphics/vertex-buffer.js +39 -19
- package/dist/graphics/vertex.js +6 -3
- package/dist/graphics/view.js +30 -14
- package/dist/index.d.ts +4 -4
- package/dist/internal/audio-codec-registry.js +12 -6
- package/dist/internal/audio-input-stream.js +2 -1
- package/dist/internal/audio-music-pump.js +58 -24
- package/dist/internal/audio-recorder-session.js +17 -7
- package/dist/internal/audio-worker-session.js +28 -10
- package/dist/internal/audio-worker.js +40 -21
- package/dist/internal/glsl-value.d.ts +3 -1
- package/dist/internal/glsl-value.js +18 -8
- package/dist/internal/graphics-state.js +29 -15
- package/dist/internal/input-stream.d.ts +3 -1
- package/dist/internal/input-stream.js +16 -7
- package/dist/internal/numeric-properties.js +2 -1
- package/dist/internal/render-states.js +2 -1
- package/dist/internal/scalar.js +22 -13
- package/dist/internal/shaped-glyph.d.ts +3 -1
- package/dist/internal/shaped-glyph.js +12 -4
- package/dist/internal/struct-view.d.ts +3 -1
- package/dist/internal/struct-view.js +3 -1
- package/dist/internal/transformable.js +2 -1
- package/dist/network/common.js +23 -11
- package/dist/network/dns.js +25 -17
- package/dist/network/ftp.js +43 -18
- package/dist/network/http.js +126 -56
- package/dist/network/ip-address.js +50 -25
- package/dist/network/packet.js +63 -25
- package/dist/network/sftp.js +175 -74
- package/dist/network/socket-selector.js +28 -14
- package/dist/network/socket.js +71 -30
- package/dist/network/tcp-listener.js +42 -19
- package/dist/network/tcp-socket.js +111 -53
- package/dist/network/tls-material.js +2 -1
- package/dist/network/udp-socket.js +68 -33
- package/dist/system/angle.js +2 -1
- package/dist/system/clock.js +4 -2
- package/dist/system/err.js +5 -2
- package/dist/system/file-input-stream.js +8 -4
- package/dist/system/input-stream.js +6 -3
- package/dist/system/operators.d.ts +1 -1
- package/dist/system/operators.js +90 -50
- package/dist/system/sleep.js +4 -2
- package/dist/system/time.js +12 -6
- package/dist/system/vector2.js +6 -7
- package/dist/system/vector3.js +11 -6
- package/dist/window/clipboard.js +2 -1
- package/dist/window/context.js +10 -5
- package/dist/window/cursor.js +2 -1
- package/dist/window/event.js +9 -5
- package/dist/window/mouse.js +4 -2
- package/dist/window/video-mode.js +2 -1
- package/dist/window/window.js +19 -12
- package/native/addon.cc +25 -12
- package/native/audio-binding.cc +266 -126
- package/native/audio-codec-binding.cc +147 -77
- package/native/audio-device-binding.cc +76 -49
- package/native/audio-file-binding.cc +116 -67
- package/native/audio-recorder-binding.cc +147 -98
- package/native/audio-recorder.h +1 -1
- package/native/audio-state.h +53 -30
- package/native/audio-stream-binding.cc +148 -94
- package/native/audio-stream.h +5 -4
- package/native/audio-worker-binding.cc +163 -81
- package/native/audio-worker.h +35 -19
- package/native/batch-drawable.cc +29 -16
- package/native/batch-drawable.h +11 -8
- package/native/context-binding.cc +40 -27
- package/native/context-settings.h +15 -8
- package/native/deferred-delete.cc +9 -6
- package/native/deferred-delete.h +7 -8
- package/native/error-stream-binding.cc +42 -28
- package/native/font-binding.cc +89 -48
- package/native/graphics-binding.cc +122 -72
- package/native/graphics-state.h +50 -36
- package/native/image-binding.cc +38 -24
- package/native/image-state.h +26 -18
- package/native/input-binding.cc +42 -27
- package/native/render-window-binding.cc +38 -23
- package/native/shader-binding.cc +115 -50
- package/native/shape-binding.cc +94 -49
- package/native/shape-state.h +18 -9
- package/native/shaped-glyph-storage.h +9 -5
- package/native/stream-binding.cc +143 -117
- package/native/system-binding.cc +17 -12
- package/native/text-binding.cc +68 -35
- package/native/text-state.h +25 -18
- package/native/texture-binding.cc +42 -33
- package/native/texture-resource.h +20 -12
- package/native/time-value.h +3 -1
- package/native/transformable-binding.cc +12 -6
- package/native/transformable-state.h +6 -6
- package/native/value-binding.h +46 -28
- package/native/value-layout.h +10 -10
- package/native/values-binding.cc +29 -23
- package/native/vertex-binding.cc +18 -12
- package/native/vertex-buffer-binding.cc +38 -24
- package/native/vertex-storage.h +2 -2
- package/native/view-data.h +4 -3
- package/native/window-binding.cc +75 -45
- package/native/window-event.h +20 -11
- package/native/window-owner.h +15 -12
- package/package.json +40 -48
- package/src/audio/effect-processor.ts +9 -3
- package/src/audio/input-sound-file.ts +108 -36
- package/src/audio/listener.ts +39 -13
- package/src/audio/music.ts +112 -47
- package/src/audio/output-sound-file.ts +40 -11
- package/src/audio/playback-device.ts +23 -8
- package/src/audio/sound-buffer-recorder.ts +35 -13
- package/src/audio/sound-buffer.ts +166 -58
- package/src/audio/sound-file-factory.ts +127 -49
- package/src/audio/sound-file-reader.ts +49 -15
- package/src/audio/sound-recorder.ts +100 -34
- package/src/audio/sound-source.ts +142 -45
- package/src/audio/sound-stream.ts +15 -5
- package/src/audio/sound.ts +12 -4
- package/src/audio/value.ts +89 -26
- package/src/graphics/blend-mode.ts +3 -1
- package/src/graphics/boolean-vector.ts +56 -26
- package/src/graphics/color.ts +3 -1
- package/src/graphics/convex-shape.ts +10 -3
- package/src/graphics/font.ts +171 -50
- package/src/graphics/glsl-matrix.ts +9 -3
- package/src/graphics/glsl.ts +81 -35
- package/src/graphics/glyph.ts +67 -26
- package/src/graphics/image.ts +119 -45
- package/src/graphics/rect.ts +56 -24
- package/src/graphics/render-states.ts +31 -14
- package/src/graphics/render-target.ts +197 -81
- package/src/graphics/render-texture.ts +36 -12
- package/src/graphics/render-window.ts +9 -3
- package/src/graphics/shader.ts +186 -61
- package/src/graphics/shape.ts +93 -35
- package/src/graphics/sprite.ts +64 -25
- package/src/graphics/stencil-mode.ts +12 -6
- package/src/graphics/swap.ts +3 -2
- package/src/graphics/text.ts +229 -74
- package/src/graphics/texture.ts +180 -61
- package/src/graphics/transform.ts +132 -47
- package/src/graphics/transformable.ts +3 -1
- package/src/graphics/vertex-array.ts +87 -35
- package/src/graphics/vertex-buffer.ts +97 -33
- package/src/graphics/vertex.ts +9 -3
- package/src/graphics/view.ts +59 -21
- package/src/index.ts +101 -23
- package/src/internal/audio-codec-registry.ts +18 -6
- package/src/internal/audio-input-stream.ts +6 -2
- package/src/internal/audio-music-pump.ts +116 -41
- package/src/internal/audio-native.ts +249 -96
- package/src/internal/audio-recorder-session.ts +68 -24
- package/src/internal/audio-worker-session.ts +65 -21
- package/src/internal/audio-worker.ts +85 -41
- package/src/internal/glsl-value.ts +26 -11
- package/src/internal/graphics-state.ts +57 -20
- package/src/internal/input-stream.ts +23 -10
- package/src/internal/native.ts +252 -99
- package/src/internal/numeric-properties.ts +2 -1
- package/src/internal/render-states.ts +3 -1
- package/src/internal/scalar.ts +33 -14
- package/src/internal/shaped-glyph.ts +25 -12
- package/src/internal/struct-view.ts +40 -13
- package/src/internal/transformable.ts +3 -1
- package/src/network/common.ts +35 -11
- package/src/network/dns.ts +95 -38
- package/src/network/ftp.ts +129 -47
- package/src/network/http.ts +232 -77
- package/src/network/ip-address.ts +118 -48
- package/src/network/packet.ts +161 -54
- package/src/network/sftp.ts +498 -168
- package/src/network/socket-selector.ts +66 -26
- package/src/network/socket.ts +133 -46
- package/src/network/tcp-listener.ts +78 -29
- package/src/network/tcp-socket.ts +240 -95
- package/src/network/tls-material.ts +6 -2
- package/src/network/udp-socket.ts +147 -53
- package/src/system/angle.ts +3 -1
- package/src/system/clock.ts +12 -4
- package/src/system/err.ts +5 -2
- package/src/system/file-input-stream.ts +12 -4
- package/src/system/input-stream.ts +9 -3
- package/src/system/operators.ts +290 -115
- package/src/system/sleep.ts +6 -2
- package/src/system/time.ts +18 -6
- package/src/system/timeout-with-predicate.ts +19 -8
- package/src/system/vector2.ts +101 -49
- package/src/system/vector3.ts +85 -36
- package/src/window/clipboard.ts +3 -1
- package/src/window/context.ts +15 -5
- package/src/window/cursor.ts +3 -1
- package/src/window/event.ts +26 -12
- package/src/window/mouse.ts +6 -2
- package/src/window/video-mode.ts +3 -1
- package/src/window/window.ts +119 -37
- package/test/native/audio-probes.cc +74 -36
- package/test/native/deferred-delete-probes.cc +17 -11
- package/test/native/drawable-probes.cc +70 -36
- package/test/native/exception-probes.cc +14 -9
- package/test/native/image-probes.cc +20 -10
- package/test/native/matrix-probes.cc +8 -4
- package/test/native/network-oracle.cc +17 -11
- package/test/native/render-texture-probes.cc +33 -24
- package/test/native/shader-probes.cc +9 -9
- package/test/native/shape-probes.cc +37 -23
- package/test/native/sprite-probes.cc +41 -25
- package/test/native/system-probes.cc +58 -35
- package/test/native/text-probes.cc +77 -44
- package/test/native/texture-probes.cc +43 -26
- package/test/native/time-probes.cc +18 -12
- package/test/native/transform-probes.cc +15 -10
- package/test/native/transformable-probes.cc +23 -17
- package/test/native/value-oracle.h +9 -4
- package/test/native/value-probes.cc +31 -23
- package/test/native/vertex-array-probes.cc +22 -14
- package/test/native/vertex-buffer-probes.cc +28 -17
- package/test/native/view-probes.cc +29 -17
- package/test/native/window-probes.cc +66 -33
- package/tools/ensure-sfml.cjs +9 -0
- package/tools/generate-network-constants.cjs +11 -6
- package/tools/generate-window-constants.cjs +31 -12
- package/docs/README.ja.md +0 -30
- package/docs/README.ko.md +0 -30
- package/docs/README.md +0 -30
- package/docs/README.zh-CN.md +0 -30
- package/docs/api.ja.md +0 -84
- package/docs/api.ko.md +0 -84
- package/docs/api.md +0 -81
- package/docs/api.zh-CN.md +0 -81
- package/docs/audio.ja.md +0 -249
- package/docs/audio.ko.md +0 -251
- package/docs/audio.md +0 -252
- package/docs/audio.zh-CN.md +0 -252
- package/docs/concepts.ja.md +0 -130
- package/docs/concepts.ko.md +0 -130
- package/docs/concepts.md +0 -131
- package/docs/concepts.zh-CN.md +0 -131
- package/docs/development.ja.md +0 -144
- package/docs/development.ko.md +0 -144
- package/docs/development.md +0 -146
- package/docs/development.zh-CN.md +0 -146
- package/docs/getting-started.ja.md +0 -154
- package/docs/getting-started.ko.md +0 -154
- package/docs/getting-started.md +0 -156
- package/docs/getting-started.zh-CN.md +0 -156
- package/docs/graphics.ja.md +0 -256
- package/docs/graphics.ko.md +0 -254
- package/docs/graphics.md +0 -255
- package/docs/graphics.zh-CN.md +0 -257
- package/docs/network.ja.md +0 -214
- package/docs/network.ko.md +0 -216
- package/docs/network.md +0 -218
- package/docs/network.zh-CN.md +0 -218
- package/docs/system.ja.md +0 -169
- package/docs/system.ko.md +0 -171
- package/docs/system.md +0 -173
- package/docs/system.zh-CN.md +0 -173
- package/docs/window.ja.md +0 -138
- package/docs/window.ko.md +0 -140
- package/docs/window.md +0 -141
- package/docs/window.zh-CN.md +0 -141
- package/native/exception-boundary.h +0 -97
- package/native/numeric-fields.h +0 -96
- package/native/shared-handle.h +0 -107
- package/test/tsconfig.json +0 -8
- package/tools/configure-lsp.cjs +0 -23
- package/tools/lib_downloader.cjs +0 -92
- package/tools/lib_downloader_urls.cjs +0 -23
|
@@ -1,15 +1,17 @@
|
|
|
1
|
+
#include <cmath>
|
|
2
|
+
#include <limits>
|
|
3
|
+
|
|
1
4
|
#include "../../native/time-value.h"
|
|
2
5
|
#include "value-oracle.h"
|
|
3
|
-
|
|
4
6
|
#include <SFML/System/Clock.hpp>
|
|
5
|
-
#include <cmath>
|
|
6
|
-
#include <limits>
|
|
7
7
|
|
|
8
8
|
namespace {
|
|
9
9
|
|
|
10
10
|
void SetTime(v8::Local<v8::Object> object, const char* key, sf::Time value) {
|
|
11
|
-
Nan::Set(object,
|
|
12
|
-
|
|
11
|
+
Nan::Set(object,
|
|
12
|
+
Nan::New(key).ToLocalChecked(),
|
|
13
|
+
sfmljs::WriteTime(v8::Isolate::GetCurrent(), value))
|
|
14
|
+
.FromJust();
|
|
13
15
|
}
|
|
14
16
|
|
|
15
17
|
NAN_METHOD(InspectTime) {
|
|
@@ -33,8 +35,8 @@ NAN_METHOD(TimeFromSeconds) {
|
|
|
33
35
|
static_cast<double>(count) >= 0x1p63) {
|
|
34
36
|
return Nan::ThrowRangeError("Seconds exceed the int64 domain");
|
|
35
37
|
}
|
|
36
|
-
info.GetReturnValue().Set(
|
|
37
|
-
|
|
38
|
+
info.GetReturnValue().Set(
|
|
39
|
+
sfmljs::WriteTime(info.GetIsolate(), sf::seconds(amount)));
|
|
38
40
|
}
|
|
39
41
|
|
|
40
42
|
NAN_METHOD(TimeFromMilliseconds) {
|
|
@@ -45,13 +47,15 @@ NAN_METHOD(TimeFromMilliseconds) {
|
|
|
45
47
|
amount > std::numeric_limits<std::int32_t>::max()) {
|
|
46
48
|
return Nan::ThrowRangeError("Milliseconds exceed the int32 domain");
|
|
47
49
|
}
|
|
48
|
-
info.GetReturnValue().Set(sfmljs::WriteTime(
|
|
49
|
-
sf::milliseconds(static_cast<std::int32_t>(amount))));
|
|
50
|
+
info.GetReturnValue().Set(sfmljs::WriteTime(
|
|
51
|
+
info.GetIsolate(), sf::milliseconds(static_cast<std::int32_t>(amount))));
|
|
50
52
|
}
|
|
51
53
|
|
|
52
54
|
template <typename Scalar>
|
|
53
55
|
void Evaluate(const Nan::FunctionCallbackInfo<v8::Value>& info,
|
|
54
|
-
sf::Time lhs,
|
|
56
|
+
sf::Time lhs,
|
|
57
|
+
sf::Time rhs,
|
|
58
|
+
Scalar scalar) {
|
|
55
59
|
auto result = Nan::New<v8::Object>();
|
|
56
60
|
SetTime(result, "add", lhs + rhs);
|
|
57
61
|
SetTime(result, "subtract", lhs - rhs);
|
|
@@ -82,7 +86,8 @@ void Evaluate(const Nan::FunctionCallbackInfo<v8::Value>& info,
|
|
|
82
86
|
|
|
83
87
|
NAN_METHOD(EvaluateTime) {
|
|
84
88
|
sf::Time lhs, rhs;
|
|
85
|
-
if (!sfmljs::ReadTime(info[0], lhs) || !sfmljs::ReadTime(info[1], rhs))
|
|
89
|
+
if (!sfmljs::ReadTime(info[0], lhs) || !sfmljs::ReadTime(info[1], rhs))
|
|
90
|
+
return;
|
|
86
91
|
// Keep every intermediate inside the defined C++ arithmetic domain.
|
|
87
92
|
if (std::abs(static_cast<double>(lhs.asMicroseconds())) > 1e12 ||
|
|
88
93
|
std::abs(static_cast<double>(rhs.asMicroseconds())) > 1e12 ||
|
|
@@ -98,7 +103,8 @@ NAN_METHOD(EvaluateTime) {
|
|
|
98
103
|
}
|
|
99
104
|
Evaluate(info, lhs, rhs, count);
|
|
100
105
|
} else if (info[2]->IsNumber()) {
|
|
101
|
-
const float scalar =
|
|
106
|
+
const float scalar =
|
|
107
|
+
static_cast<float>(Nan::To<double>(info[2]).FromJust());
|
|
102
108
|
if (!std::isfinite(scalar) || std::abs(scalar) < 1e-4f ||
|
|
103
109
|
std::abs(scalar) > 1e4f) {
|
|
104
110
|
return Nan::ThrowRangeError("Time oracle float scalar is out of range");
|
|
@@ -11,15 +11,17 @@ using AngleHandle = sfmljs::SharedHandle<sf::Angle>;
|
|
|
11
11
|
v8::Local<v8::Array> Matrix(const sf::Transform& transform) {
|
|
12
12
|
auto array = Nan::New<v8::Array>(16);
|
|
13
13
|
for (std::uint32_t i = 0; i < 16; ++i) {
|
|
14
|
-
Nan::Set(array, i, Nan::New(
|
|
15
|
-
|
|
14
|
+
Nan::Set(array, i, Nan::New(static_cast<double>(transform.getMatrix()[i])))
|
|
15
|
+
.FromJust();
|
|
16
16
|
}
|
|
17
17
|
return array;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
void SetMatrix(v8::Local<v8::Object> result,
|
|
20
|
+
void SetMatrix(v8::Local<v8::Object> result,
|
|
21
|
+
const char* name,
|
|
21
22
|
const sf::Transform& transform) {
|
|
22
|
-
Nan::Set(result, Nan::New(name).ToLocalChecked(), Matrix(transform))
|
|
23
|
+
Nan::Set(result, Nan::New(name).ToLocalChecked(), Matrix(transform))
|
|
24
|
+
.FromJust();
|
|
23
25
|
}
|
|
24
26
|
|
|
25
27
|
NAN_METHOD(ReadTransform) {
|
|
@@ -30,9 +32,9 @@ NAN_METHOD(ReadTransform) {
|
|
|
30
32
|
NAN_METHOD(TranslateTransform) {
|
|
31
33
|
auto* handle = TransformHandle::From(info[0]);
|
|
32
34
|
if (!handle) return;
|
|
33
|
-
handle->owner()->translate(
|
|
34
|
-
static_cast<float>(Nan::To<double>(info[1]).FromMaybe(0)),
|
|
35
|
-
|
|
35
|
+
handle->owner()->translate(
|
|
36
|
+
{static_cast<float>(Nan::To<double>(info[1]).FromMaybe(0)),
|
|
37
|
+
static_cast<float>(Nan::To<double>(info[2]).FromMaybe(0))});
|
|
36
38
|
}
|
|
37
39
|
|
|
38
40
|
NAN_METHOD(EvaluateTransform) {
|
|
@@ -63,7 +65,8 @@ NAN_METHOD(EvaluateTransform) {
|
|
|
63
65
|
auto rectangle = Nan::New<v8::Object>();
|
|
64
66
|
sfmljs::SetVector(rectangle, "position", bounds.position);
|
|
65
67
|
sfmljs::SetVector(rectangle, "size", bounds.size);
|
|
66
|
-
Nan::Set(result, Nan::New("rectangle").ToLocalChecked(), rectangle)
|
|
68
|
+
Nan::Set(result, Nan::New("rectangle").ToLocalChecked(), rectangle)
|
|
69
|
+
.FromJust();
|
|
67
70
|
auto value = a;
|
|
68
71
|
SetMatrix(result, "combine", value.combine(b));
|
|
69
72
|
value = a;
|
|
@@ -73,11 +76,13 @@ NAN_METHOD(EvaluateTransform) {
|
|
|
73
76
|
value = a;
|
|
74
77
|
SetMatrix(result, "scale", value.scale(*factors->owner()));
|
|
75
78
|
value = a;
|
|
76
|
-
SetMatrix(
|
|
79
|
+
SetMatrix(
|
|
80
|
+
result, "scaleCenter", value.scale(*factors->owner(), *center->owner()));
|
|
77
81
|
value = a;
|
|
78
82
|
SetMatrix(result, "rotate", value.rotate(*angle->owner()));
|
|
79
83
|
value = a;
|
|
80
|
-
SetMatrix(
|
|
84
|
+
SetMatrix(
|
|
85
|
+
result, "rotateCenter", value.rotate(*angle->owner(), *center->owner()));
|
|
81
86
|
sfmljs::Set(result, "equal", a == b);
|
|
82
87
|
sfmljs::Set(result, "notEqual", a != b);
|
|
83
88
|
info.GetReturnValue().Set(result);
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
+
#include <cmath>
|
|
2
|
+
#include <limits>
|
|
3
|
+
|
|
1
4
|
#include "../../native/graphics-state.h"
|
|
2
5
|
#include "value-oracle.h"
|
|
3
|
-
|
|
4
6
|
#include <SFML/Graphics/Image.hpp>
|
|
5
7
|
|
|
6
|
-
#include <cmath>
|
|
7
|
-
#include <limits>
|
|
8
|
-
|
|
9
8
|
namespace {
|
|
10
9
|
|
|
11
10
|
using sfmljs::SharedHandle;
|
|
12
11
|
using StateHandle = SharedHandle<sfmljs::TransformableState>;
|
|
13
12
|
|
|
14
|
-
bool ReadData(v8::Local<v8::Value> input,
|
|
13
|
+
bool ReadData(v8::Local<v8::Value> input,
|
|
14
|
+
sfmljs::TransformableData& data) { // NOLINT(runtime/references)
|
|
15
15
|
if (!input->IsFloat32Array() ||
|
|
16
16
|
input.As<v8::Float32Array>()->ByteLength() != sizeof(data)) {
|
|
17
17
|
Nan::ThrowTypeError("Expected seven float32 transform components");
|
|
@@ -19,8 +19,7 @@ bool ReadData(v8::Local<v8::Value> input, sfmljs::TransformableData& data) {
|
|
|
19
19
|
}
|
|
20
20
|
input.As<v8::Float32Array>()->CopyContents(data.data(), sizeof(data));
|
|
21
21
|
const double quotient = std::trunc(data[2] / sf::priv::tau);
|
|
22
|
-
if (!std::isfinite(quotient) ||
|
|
23
|
-
quotient < std::numeric_limits<int>::min() ||
|
|
22
|
+
if (!std::isfinite(quotient) || quotient < std::numeric_limits<int>::min() ||
|
|
24
23
|
quotient > std::numeric_limits<int>::max()) {
|
|
25
24
|
Nan::ThrowRangeError("Rotation is outside SFML's wrapping domain");
|
|
26
25
|
return false;
|
|
@@ -29,7 +28,8 @@ bool ReadData(v8::Local<v8::Value> input, sfmljs::TransformableData& data) {
|
|
|
29
28
|
}
|
|
30
29
|
|
|
31
30
|
// Deliberately independent of the production staging-to-SFML helper.
|
|
32
|
-
void SetOracle(sf::Transformable& object,
|
|
31
|
+
void SetOracle(sf::Transformable& object, // NOLINT(runtime/references)
|
|
32
|
+
const sfmljs::TransformableData& data) {
|
|
33
33
|
object.setOrigin({data[5], data[6]});
|
|
34
34
|
object.setScale({data[3], data[4]});
|
|
35
35
|
object.setRotation(sf::radians(data[2]));
|
|
@@ -45,8 +45,9 @@ v8::Local<v8::Object> Snapshot(const sf::Transformable& object) {
|
|
|
45
45
|
const auto set = [&](const char* name, const sf::Transform& transform) {
|
|
46
46
|
auto matrix = Nan::New<v8::Array>(16);
|
|
47
47
|
for (std::uint32_t i = 0; i < 16; ++i) {
|
|
48
|
-
Nan::Set(
|
|
49
|
-
Nan::New(static_cast<double>(transform.getMatrix()[i])))
|
|
48
|
+
Nan::Set(
|
|
49
|
+
matrix, i, Nan::New(static_cast<double>(transform.getMatrix()[i])))
|
|
50
|
+
.FromJust();
|
|
50
51
|
}
|
|
51
52
|
Nan::Set(result, Nan::New(name).ToLocalChecked(), matrix).FromJust();
|
|
52
53
|
};
|
|
@@ -106,11 +107,13 @@ NAN_METHOD(EvaluateTransformable) {
|
|
|
106
107
|
sf::Transformable object;
|
|
107
108
|
SetOracle(object, data);
|
|
108
109
|
auto result = Nan::New<v8::Object>();
|
|
109
|
-
Nan::Set(result, Nan::New("base").ToLocalChecked(), Snapshot(object))
|
|
110
|
+
Nan::Set(result, Nan::New("base").ToLocalChecked(), Snapshot(object))
|
|
111
|
+
.FromJust();
|
|
110
112
|
object.move(*offset->owner());
|
|
111
113
|
object.rotate(*angle->owner());
|
|
112
114
|
object.scale(*factors->owner());
|
|
113
|
-
Nan::Set(result, Nan::New("changed").ToLocalChecked(), Snapshot(object))
|
|
115
|
+
Nan::Set(result, Nan::New("changed").ToLocalChecked(), Snapshot(object))
|
|
116
|
+
.FromJust();
|
|
114
117
|
info.GetReturnValue().Set(result);
|
|
115
118
|
}
|
|
116
119
|
|
|
@@ -125,7 +128,8 @@ NAN_METHOD(RenderSpriteSnapshots) {
|
|
|
125
128
|
if (!ReadData(Nan::Get(inputs, i).ToLocalChecked(), snapshots[i])) return;
|
|
126
129
|
}
|
|
127
130
|
sf::RenderTexture target;
|
|
128
|
-
if (!target.resize({64, 64}))
|
|
131
|
+
if (!target.resize({64, 64}))
|
|
132
|
+
return Nan::ThrowError("Could not render oracle");
|
|
129
133
|
target.clear(sf::Color::Black);
|
|
130
134
|
sf::Sprite sprite(*texture->owner());
|
|
131
135
|
for (const auto& values : snapshots) {
|
|
@@ -134,9 +138,10 @@ NAN_METHOD(RenderSpriteSnapshots) {
|
|
|
134
138
|
}
|
|
135
139
|
target.display();
|
|
136
140
|
const auto image = target.getTexture().copyToImage();
|
|
137
|
-
info.GetReturnValue().Set(
|
|
138
|
-
reinterpret_cast<const char*>(image.getPixelsPtr()),
|
|
139
|
-
|
|
141
|
+
info.GetReturnValue().Set(
|
|
142
|
+
Nan::CopyBuffer(reinterpret_cast<const char*>(image.getPixelsPtr()),
|
|
143
|
+
64 * 64 * 4)
|
|
144
|
+
.ToLocalChecked());
|
|
140
145
|
}
|
|
141
146
|
|
|
142
147
|
} // namespace
|
|
@@ -146,7 +151,8 @@ NAN_MODULE_INIT(InitializeTransformableProbes) {
|
|
|
146
151
|
Nan::SetMethod(target, "setTransformableState", SetTransformableState);
|
|
147
152
|
Nan::SetMethod(target, "retainTransformable", RetainTransformable);
|
|
148
153
|
Nan::SetMethod(target, "transformableUseCount", TransformableUseCount);
|
|
149
|
-
Nan::SetMethod(
|
|
154
|
+
Nan::SetMethod(
|
|
155
|
+
target, "transformableSharesSprite", TransformableSharesSprite);
|
|
150
156
|
Nan::SetMethod(target, "evaluateTransformable", EvaluateTransformable);
|
|
151
157
|
Nan::SetMethod(target, "renderSpriteSnapshots", RenderSpriteSnapshots);
|
|
152
158
|
}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
#pragma once
|
|
2
2
|
|
|
3
3
|
#include <nan.h>
|
|
4
|
-
#include <SFML/System/Angle.hpp>
|
|
5
4
|
|
|
6
5
|
#include <cmath>
|
|
7
6
|
#include <type_traits>
|
|
8
7
|
|
|
8
|
+
#include <SFML/System/Angle.hpp>
|
|
9
|
+
|
|
9
10
|
namespace sfmljs {
|
|
10
11
|
|
|
11
12
|
inline void Set(v8::Local<v8::Object> object, const char* key, double value) {
|
|
@@ -28,7 +29,8 @@ v8::Local<v8::Value> ScalarValue(T value) {
|
|
|
28
29
|
template <typename T>
|
|
29
30
|
requires(std::is_integral_v<T> && sizeof(T) == 8)
|
|
30
31
|
void Set(v8::Local<v8::Object> object, const char* key, T value) {
|
|
31
|
-
Nan::Set(object, Nan::New(key).ToLocalChecked(), ScalarValue(value))
|
|
32
|
+
Nan::Set(object, Nan::New(key).ToLocalChecked(), ScalarValue(value))
|
|
33
|
+
.FromJust();
|
|
32
34
|
}
|
|
33
35
|
|
|
34
36
|
template <typename V>
|
|
@@ -49,14 +51,17 @@ v8::Local<v8::Array> Coordinates(const V& vector) {
|
|
|
49
51
|
|
|
50
52
|
template <typename V>
|
|
51
53
|
void SetVector(v8::Local<v8::Object> object, const char* key, const V& vector) {
|
|
52
|
-
Nan::Set(object, Nan::New(key).ToLocalChecked(), Coordinates(vector))
|
|
54
|
+
Nan::Set(object, Nan::New(key).ToLocalChecked(), Coordinates(vector))
|
|
55
|
+
.FromJust();
|
|
53
56
|
}
|
|
54
57
|
|
|
55
58
|
// Internal test oracle. Signed inputs and all their intermediate arithmetic
|
|
56
59
|
// must stay in range; C++ signed overflow is undefined.
|
|
57
60
|
template <typename V>
|
|
58
61
|
void EvaluateOperators(v8::Local<v8::Object> result,
|
|
59
|
-
const V& lhs,
|
|
62
|
+
const V& lhs,
|
|
63
|
+
const V& rhs,
|
|
64
|
+
decltype(V::x) scalar) {
|
|
60
65
|
SetVector(result, "add", lhs + rhs);
|
|
61
66
|
SetVector(result, "subtract", lhs - rhs);
|
|
62
67
|
SetVector(result, "negate", -lhs);
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
#include "../../native/value-binding.h"
|
|
2
|
-
#include "value-oracle.h"
|
|
3
|
-
|
|
4
1
|
#include <limits>
|
|
5
2
|
#include <type_traits>
|
|
6
3
|
|
|
4
|
+
#include "../../native/value-binding.h"
|
|
5
|
+
#include "value-oracle.h"
|
|
6
|
+
|
|
7
|
+
namespace sfmljs::values {
|
|
7
8
|
namespace {
|
|
8
9
|
|
|
9
|
-
using namespace sfmljs::values;
|
|
10
10
|
using AngleHandle = sfmljs::SharedHandle<sf::Angle>;
|
|
11
11
|
using ColorHandle = sfmljs::SharedHandle<sf::Color>;
|
|
12
12
|
using VertexHandle = sfmljs::SharedHandle<sf::Vertex>;
|
|
@@ -18,7 +18,8 @@ NAN_METHOD(SameBackingStore) {
|
|
|
18
18
|
const auto left = info[0].As<v8::ArrayBuffer>();
|
|
19
19
|
const auto right = info[1].As<v8::ArrayBuffer>();
|
|
20
20
|
info.GetReturnValue().Set(!left->WasDetached() && !right->WasDetached() &&
|
|
21
|
-
|
|
21
|
+
left->GetBackingStore() ==
|
|
22
|
+
right->GetBackingStore());
|
|
22
23
|
}
|
|
23
24
|
|
|
24
25
|
// These entry points are internal test probes, not production value operations.
|
|
@@ -33,8 +34,7 @@ void Retain(const CallbackInfo& info) {
|
|
|
33
34
|
template <typename Values>
|
|
34
35
|
void UseCount(const CallbackInfo& info) {
|
|
35
36
|
Values::Visit(info[0], [&](auto* handle) {
|
|
36
|
-
info.GetReturnValue().Set(
|
|
37
|
-
static_cast<double>(handle->owner().use_count()));
|
|
37
|
+
info.GetReturnValue().Set(static_cast<double>(handle->owner().use_count()));
|
|
38
38
|
});
|
|
39
39
|
}
|
|
40
40
|
|
|
@@ -46,24 +46,26 @@ NAN_METHOD(ReadAngle) {
|
|
|
46
46
|
NAN_METHOD(SetAngle) {
|
|
47
47
|
auto* handle = AngleHandle::From(info[0]);
|
|
48
48
|
if (!handle) return;
|
|
49
|
-
*handle->owner() =
|
|
50
|
-
Nan::To<double>(info[1]).FromMaybe(0)));
|
|
49
|
+
*handle->owner() =
|
|
50
|
+
sf::radians(static_cast<float>(Nan::To<double>(info[1]).FromMaybe(0)));
|
|
51
51
|
}
|
|
52
52
|
|
|
53
53
|
bool ValidRemainder(float lhs, float rhs) {
|
|
54
54
|
const double quotient = std::trunc(static_cast<double>(lhs / rhs));
|
|
55
55
|
return rhs > 0 && std::isfinite(quotient) &&
|
|
56
|
-
|
|
57
|
-
|
|
56
|
+
quotient >= std::numeric_limits<int>::min() &&
|
|
57
|
+
quotient <= std::numeric_limits<int>::max();
|
|
58
58
|
}
|
|
59
59
|
|
|
60
60
|
NAN_METHOD(EvaluateAngle) {
|
|
61
61
|
const float a = static_cast<float>(Nan::To<double>(info[0]).FromMaybe(0));
|
|
62
62
|
const float b = static_cast<float>(Nan::To<double>(info[1]).FromMaybe(0));
|
|
63
|
-
const float scalar =
|
|
63
|
+
const float scalar =
|
|
64
|
+
static_cast<float>(Nan::To<double>(info[2]).FromMaybe(3));
|
|
64
65
|
if (scalar == 0 || !ValidRemainder(a, b) ||
|
|
65
66
|
!ValidRemainder(a + sf::priv::pi, sf::priv::tau)) {
|
|
66
|
-
return Nan::ThrowRangeError(
|
|
67
|
+
return Nan::ThrowRangeError(
|
|
68
|
+
"Angle oracle inputs are outside SFML's domain");
|
|
67
69
|
}
|
|
68
70
|
const auto lhs = sf::radians(a);
|
|
69
71
|
const auto rhs = sf::radians(b);
|
|
@@ -166,9 +168,11 @@ void EvaluateVector(const CallbackInfo& info) {
|
|
|
166
168
|
sfmljs::Set(result, "cross", vector.cross(other));
|
|
167
169
|
sfmljs::SetVector(result, "perpendicular", vector.perpendicular());
|
|
168
170
|
}
|
|
169
|
-
sfmljs::SetVector(
|
|
171
|
+
sfmljs::SetVector(
|
|
172
|
+
result, "componentWiseMul", vector.componentWiseMul(other));
|
|
170
173
|
if (canDivide) {
|
|
171
|
-
sfmljs::SetVector(
|
|
174
|
+
sfmljs::SetVector(
|
|
175
|
+
result, "componentWiseDiv", vector.componentWiseDiv(other));
|
|
172
176
|
}
|
|
173
177
|
// The test oracle uses a representable, nonzero scalar for all types.
|
|
174
178
|
sfmljs::EvaluateOperators(result, vector, other, T(3));
|
|
@@ -272,8 +276,10 @@ NAN_METHOD(EvaluateRect) {
|
|
|
272
276
|
sfmljs::Set(result, "notEqual", left != right);
|
|
273
277
|
const auto intersection = left.findIntersection(right);
|
|
274
278
|
if (intersection) {
|
|
275
|
-
Nan::Set(result,
|
|
276
|
-
|
|
279
|
+
Nan::Set(result,
|
|
280
|
+
Nan::New("intersection").ToLocalChecked(),
|
|
281
|
+
RectCoordinates(*intersection))
|
|
282
|
+
.FromJust();
|
|
277
283
|
}
|
|
278
284
|
info.GetReturnValue().Set(result);
|
|
279
285
|
});
|
|
@@ -308,16 +314,17 @@ NAN_METHOD(EvaluateVertex) {
|
|
|
308
314
|
if (!texCoords) return;
|
|
309
315
|
auto result = Nan::New<v8::Object>();
|
|
310
316
|
const auto set = [&](const char* name, const sf::Vertex& vertex) {
|
|
311
|
-
Nan::Set(result, Nan::New(name).ToLocalChecked(),
|
|
312
|
-
|
|
317
|
+
Nan::Set(result, Nan::New(name).ToLocalChecked(), VertexFields(vertex))
|
|
318
|
+
.FromJust();
|
|
313
319
|
};
|
|
314
320
|
set("default", sf::Vertex{});
|
|
315
321
|
set("position", sf::Vertex{*position->owner()});
|
|
316
322
|
set("color", sf::Vertex{*position->owner(), *color->owner()});
|
|
317
|
-
set("texCoords",
|
|
318
|
-
*position->owner(), *color->owner(), *texCoords->owner()});
|
|
319
|
-
set("defaultColor",
|
|
320
|
-
.position = *position->owner(),
|
|
323
|
+
set("texCoords",
|
|
324
|
+
sf::Vertex{*position->owner(), *color->owner(), *texCoords->owner()});
|
|
325
|
+
set("defaultColor",
|
|
326
|
+
sf::Vertex{.position = *position->owner(),
|
|
327
|
+
.texCoords = *texCoords->owner()});
|
|
321
328
|
info.GetReturnValue().Set(result);
|
|
322
329
|
}
|
|
323
330
|
|
|
@@ -377,3 +384,4 @@ NAN_MODULE_INIT(InitializeValueProbes) {
|
|
|
377
384
|
Nan::SetMethod(target, "retainMat4", Retain<Mat4Values>);
|
|
378
385
|
Nan::SetMethod(target, "mat4UseCount", UseCount<Mat4Values>);
|
|
379
386
|
}
|
|
387
|
+
} // namespace sfmljs::values
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
#include
|
|
1
|
+
#include <array>
|
|
2
2
|
|
|
3
|
+
#include "shared-handle.h"
|
|
3
4
|
#include <SFML/Graphics/Image.hpp>
|
|
4
5
|
#include <SFML/Graphics/RenderTexture.hpp>
|
|
5
6
|
#include <SFML/Graphics/VertexArray.hpp>
|
|
6
7
|
|
|
7
|
-
#include <array>
|
|
8
|
-
|
|
9
8
|
namespace {
|
|
10
9
|
|
|
11
10
|
// Ordinary sf::VertexArray + immediate draws, independent of command storage.
|
|
@@ -19,10 +18,11 @@ NAN_METHOD(RenderVertexArrayOracle) {
|
|
|
19
18
|
const bool normalized = Nan::To<bool>(info[2]).FromJust();
|
|
20
19
|
sf::VertexArray vertices(
|
|
21
20
|
static_cast<sf::PrimitiveType>(Nan::To<unsigned>(info[1]).FromJust()), 6);
|
|
22
|
-
const std::array<sf::Vector2f, 6> positions{
|
|
23
|
-
{0, 0}, {10, 0}, {0, 10}, {0, 10}, {10, 0}, {10, 10}}};
|
|
21
|
+
const std::array<sf::Vector2f, 6> positions{
|
|
22
|
+
{{0, 0}, {10, 0}, {0, 10}, {0, 10}, {10, 0}, {10, 10}}};
|
|
24
23
|
for (std::size_t i = 0; i < positions.size(); ++i) {
|
|
25
|
-
vertices[i] = {
|
|
24
|
+
vertices[i] = {
|
|
25
|
+
positions[i],
|
|
26
26
|
sf::Color(static_cast<std::uint8_t>(80 + i * 25), 180, 220, 160),
|
|
27
27
|
positions[i] / (normalized ? 10.f : 5.f)};
|
|
28
28
|
}
|
|
@@ -34,23 +34,31 @@ NAN_METHOD(RenderVertexArrayOracle) {
|
|
|
34
34
|
}
|
|
35
35
|
target.clear(sf::Color(24, 40, 72, 180), 0);
|
|
36
36
|
sf::RenderStates states;
|
|
37
|
-
states.transform.translate({7, 5})
|
|
37
|
+
states.transform.translate({7, 5})
|
|
38
|
+
.scale({1.3f, 0.8f})
|
|
38
39
|
.rotate(sf::degrees(23));
|
|
39
40
|
states.texture = texture->owner().get();
|
|
40
|
-
states.coordinateType =
|
|
41
|
-
|
|
41
|
+
states.coordinateType =
|
|
42
|
+
normalized ? sf::CoordinateType::Normalized : sf::CoordinateType::Pixels;
|
|
42
43
|
states.blendMode = sf::BlendAdd;
|
|
43
44
|
states.stencilMode = {sf::StencilComparison::Always,
|
|
44
|
-
|
|
45
|
+
sf::StencilUpdateOperation::Replace,
|
|
46
|
+
3,
|
|
47
|
+
0xff,
|
|
48
|
+
true};
|
|
45
49
|
target.draw(vertices, states);
|
|
46
50
|
states.stencilMode = {sf::StencilComparison::Equal,
|
|
47
|
-
|
|
51
|
+
sf::StencilUpdateOperation::Keep,
|
|
52
|
+
3,
|
|
53
|
+
0xff,
|
|
54
|
+
false};
|
|
48
55
|
target.draw(vertices, states);
|
|
49
56
|
target.display();
|
|
50
57
|
const auto image = target.getTexture().copyToImage();
|
|
51
|
-
info.GetReturnValue().Set(
|
|
52
|
-
reinterpret_cast<const char*>(image.getPixelsPtr()),
|
|
53
|
-
|
|
58
|
+
info.GetReturnValue().Set(
|
|
59
|
+
Nan::CopyBuffer(reinterpret_cast<const char*>(image.getPixelsPtr()),
|
|
60
|
+
32 * 32 * 4)
|
|
61
|
+
.ToLocalChecked());
|
|
54
62
|
}
|
|
55
63
|
|
|
56
64
|
NAN_METHOD(VertexArrayBoundsOracle) {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
#include "../../native/graphics-state.h"
|
|
2
|
-
#include "../../native/shared-handle.h"
|
|
3
|
-
|
|
4
|
-
#include <SFML/Graphics/Image.hpp>
|
|
5
1
|
#define GL_SILENCE_DEPRECATION
|
|
6
|
-
#include <SFML/OpenGL.hpp>
|
|
7
2
|
|
|
8
3
|
#include <array>
|
|
9
4
|
|
|
5
|
+
#include "../../native/graphics-state.h"
|
|
6
|
+
#include "shared-handle.h"
|
|
7
|
+
#include <SFML/Graphics/Image.hpp>
|
|
8
|
+
#include <SFML/OpenGL.hpp>
|
|
9
|
+
|
|
10
10
|
namespace {
|
|
11
11
|
|
|
12
12
|
NAN_METHOD(RenderVertexBufferOracle) {
|
|
@@ -14,14 +14,16 @@ NAN_METHOD(RenderVertexBufferOracle) {
|
|
|
14
14
|
if (!texture) return;
|
|
15
15
|
if (!info[1]->IsUint32() || Nan::To<unsigned>(info[1]).FromJust() > 5 ||
|
|
16
16
|
!info[2]->IsBoolean() || !info[3]->IsUint32() || !info[4]->IsUint32()) {
|
|
17
|
-
return Nan::ThrowTypeError(
|
|
17
|
+
return Nan::ThrowTypeError(
|
|
18
|
+
"Expected primitive type, normalized flag and range");
|
|
18
19
|
}
|
|
19
20
|
const bool normalized = Nan::To<bool>(info[2]).FromJust();
|
|
20
21
|
std::array<sf::Vertex, 6> vertices;
|
|
21
|
-
const std::array<sf::Vector2f, 6> positions{
|
|
22
|
-
{0, 0}, {10, 0}, {0, 10}, {0, 10}, {10, 0}, {10, 10}}};
|
|
22
|
+
const std::array<sf::Vector2f, 6> positions{
|
|
23
|
+
{{0, 0}, {10, 0}, {0, 10}, {0, 10}, {10, 0}, {10, 10}}};
|
|
23
24
|
for (std::size_t i = 0; i < vertices.size(); ++i) {
|
|
24
|
-
vertices[i] = {
|
|
25
|
+
vertices[i] = {
|
|
26
|
+
positions[i],
|
|
25
27
|
sf::Color(static_cast<std::uint8_t>(80 + i * 25), 180, 220, 160),
|
|
26
28
|
positions[i] / (normalized ? 10.f : 5.f)};
|
|
27
29
|
}
|
|
@@ -45,24 +47,33 @@ NAN_METHOD(RenderVertexBufferOracle) {
|
|
|
45
47
|
view.setScissor({{0.2f, 0.2f}, {0.7f, 0.6f}});
|
|
46
48
|
target.setView(view);
|
|
47
49
|
sf::RenderStates states;
|
|
48
|
-
states.transform.translate({7, 5})
|
|
50
|
+
states.transform.translate({7, 5})
|
|
51
|
+
.scale({1.3f, 0.8f})
|
|
52
|
+
.rotate(sf::degrees(23));
|
|
49
53
|
states.texture = texture->owner().get();
|
|
50
|
-
states.coordinateType =
|
|
51
|
-
|
|
54
|
+
states.coordinateType =
|
|
55
|
+
normalized ? sf::CoordinateType::Normalized : sf::CoordinateType::Pixels;
|
|
52
56
|
states.blendMode = sf::BlendAdd;
|
|
53
57
|
states.stencilMode = {sf::StencilComparison::Always,
|
|
54
|
-
|
|
58
|
+
sf::StencilUpdateOperation::Replace,
|
|
59
|
+
3,
|
|
60
|
+
0xff,
|
|
61
|
+
true};
|
|
55
62
|
const auto first = Nan::To<unsigned>(info[3]).FromJust();
|
|
56
63
|
const auto count = Nan::To<unsigned>(info[4]).FromJust();
|
|
57
64
|
target.draw(buffer, first, count, states);
|
|
58
65
|
states.stencilMode = {sf::StencilComparison::Equal,
|
|
59
|
-
|
|
66
|
+
sf::StencilUpdateOperation::Keep,
|
|
67
|
+
3,
|
|
68
|
+
0xff,
|
|
69
|
+
false};
|
|
60
70
|
target.draw(buffer, first, count, states);
|
|
61
71
|
target.display();
|
|
62
72
|
const auto image = target.getTexture().copyToImage();
|
|
63
|
-
info.GetReturnValue().Set(
|
|
64
|
-
reinterpret_cast<const char*>(image.getPixelsPtr()),
|
|
65
|
-
|
|
73
|
+
info.GetReturnValue().Set(
|
|
74
|
+
Nan::CopyBuffer(reinterpret_cast<const char*>(image.getPixelsPtr()),
|
|
75
|
+
32 * 32 * 4)
|
|
76
|
+
.ToLocalChecked());
|
|
66
77
|
}
|
|
67
78
|
|
|
68
79
|
NAN_METHOD(VertexBufferRegistrySize) {
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
#include "../../native/graphics-state.h"
|
|
2
2
|
#include "../../native/image-state.h"
|
|
3
3
|
#include "../../native/view-data.h"
|
|
4
|
-
|
|
5
4
|
#include <SFML/Window/Context.hpp>
|
|
6
5
|
#define GL_SILENCE_DEPRECATION
|
|
7
6
|
#include <SFML/OpenGL.hpp>
|
|
@@ -19,7 +18,8 @@ v8::Local<v8::Array> Array(const T* values, std::uint32_t count) {
|
|
|
19
18
|
return result;
|
|
20
19
|
}
|
|
21
20
|
|
|
22
|
-
bool ReadView(v8::Local<v8::Value> value,
|
|
21
|
+
bool ReadView(v8::Local<v8::Value> value,
|
|
22
|
+
sf::View& view) { // NOLINT(runtime/references)
|
|
23
23
|
if (!value->IsFloat32Array() ||
|
|
24
24
|
value.As<v8::Float32Array>()->Length() != 13) {
|
|
25
25
|
Nan::ThrowTypeError("Expected 13 view floats");
|
|
@@ -40,10 +40,14 @@ NAN_METHOD(ViewOracle) {
|
|
|
40
40
|
sf::View view;
|
|
41
41
|
if (!ReadView(info[0], view)) return;
|
|
42
42
|
auto result = Nan::New<v8::Object>();
|
|
43
|
-
Nan::Set(result,
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
43
|
+
Nan::Set(result,
|
|
44
|
+
Nan::New("matrix").ToLocalChecked(),
|
|
45
|
+
Array(view.getTransform().getMatrix(), 16))
|
|
46
|
+
.FromJust();
|
|
47
|
+
Nan::Set(result,
|
|
48
|
+
Nan::New("inverse").ToLocalChecked(),
|
|
49
|
+
Array(view.getInverseTransform().getMatrix(), 16))
|
|
50
|
+
.FromJust();
|
|
47
51
|
info.GetReturnValue().Set(result);
|
|
48
52
|
}
|
|
49
53
|
|
|
@@ -54,17 +58,25 @@ NAN_METHOD(ViewCoordinatesOracle) {
|
|
|
54
58
|
if (!ReadView(info[1], view)) return;
|
|
55
59
|
const auto pixel = target->owner()->target.mapCoordsToPixel(
|
|
56
60
|
{static_cast<float>(Nan::To<double>(info[2]).FromJust()),
|
|
57
|
-
static_cast<float>(Nan::To<double>(info[3]).FromJust())},
|
|
61
|
+
static_cast<float>(Nan::To<double>(info[3]).FromJust())},
|
|
62
|
+
view);
|
|
58
63
|
const auto point = target->owner()->target.mapPixelToCoords(
|
|
59
|
-
{Nan::To<int>(info[4]).FromJust(), Nan::To<int>(info[5]).FromJust()},
|
|
64
|
+
{Nan::To<int>(info[4]).FromJust(), Nan::To<int>(info[5]).FromJust()},
|
|
65
|
+
view);
|
|
60
66
|
const auto viewport = target->owner()->target.getViewport(view);
|
|
61
67
|
const auto scissor = target->owner()->target.getScissor(view);
|
|
62
|
-
const double values[] = {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
+
const double values[] = {static_cast<double>(pixel.x),
|
|
69
|
+
static_cast<double>(pixel.y),
|
|
70
|
+
point.x,
|
|
71
|
+
point.y,
|
|
72
|
+
static_cast<double>(viewport.position.x),
|
|
73
|
+
static_cast<double>(viewport.position.y),
|
|
74
|
+
static_cast<double>(viewport.size.x),
|
|
75
|
+
static_cast<double>(viewport.size.y),
|
|
76
|
+
static_cast<double>(scissor.position.x),
|
|
77
|
+
static_cast<double>(scissor.position.y),
|
|
78
|
+
static_cast<double>(scissor.size.x),
|
|
79
|
+
static_cast<double>(scissor.size.y)};
|
|
68
80
|
info.GetReturnValue().Set(Array(values, 12));
|
|
69
81
|
}
|
|
70
82
|
|
|
@@ -95,7 +107,8 @@ NAN_METHOD(RenderViewOracle) {
|
|
|
95
107
|
sprite.setColor(sf::Color::Yellow);
|
|
96
108
|
target.draw(sprite);
|
|
97
109
|
target.display();
|
|
98
|
-
info.GetReturnValue().Set(sfmljs::MapImage(
|
|
110
|
+
info.GetReturnValue().Set(sfmljs::MapImage(
|
|
111
|
+
info.GetIsolate(),
|
|
99
112
|
std::make_shared<sf::Image>(target.getTexture().copyToImage())));
|
|
100
113
|
}
|
|
101
114
|
|
|
@@ -111,8 +124,7 @@ NAN_METHOD(SetExternalGLState) {
|
|
|
111
124
|
enable(GL_DEPTH_TEST);
|
|
112
125
|
enable(GL_CULL_FACE);
|
|
113
126
|
viewport(1, 2, 17, 19);
|
|
114
|
-
const float matrix[] = {2, 0, 0, 0, 0, 3, 0, 0,
|
|
115
|
-
0, 0, 1, 0, 5, 7, 0, 1};
|
|
127
|
+
const float matrix[] = {2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, 5, 7, 0, 1};
|
|
116
128
|
for (const auto type : {GL_MODELVIEW, GL_PROJECTION, GL_TEXTURE}) {
|
|
117
129
|
mode(type);
|
|
118
130
|
load(matrix);
|