Skip to content

Commit

Permalink
iOS: compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
jingpeng committed Jul 27, 2023
1 parent d8dd84d commit cc96e4b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions common/dangle/DangleContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ namespace dangle::gl_cpp {
glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &formatsNumber);
});

std::vector<TypedArrayBase::ContentType<TypedArrayKind::Float32Array>> glResults(formatsNumber);
std::vector<GLint> glResults(formatsNumber);
addBlockingToNextBatch([&] {
glGetFloatv(GL_COMPRESSED_TEXTURE_FORMATS, glResults.data());
glGetIntegerv(GL_COMPRESSED_TEXTURE_FORMATS, glResults.data());
});

for (float glResult : glResults) {
Expand Down
2 changes: 2 additions & 0 deletions example/iOS/App/SampleViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ - (void)viewDidLoad {
[self.tableDataArr addObject:[NSString stringWithFormat:@"mdn_webgl/Sample%i", i]];
}
} else if ([self.engineType isEqual: @"Three.js"]) {
[self.tableDataArr addObject:@"three.js/line_chart"];

[self.tableDataArr addObject:@"three.js/chess"];

[self.tableDataArr addObject:@"three.js/d3_force"];
Expand Down
2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"plotly.js": "^2.24.3",
"query-selector": "^2.0.0",
"regl": "^2.1.0",
"rollup": "^3.26.3",
"rollup": "^2.79.1",
"stardust-core": "^0.2.4",
"stardust-webgl": "^0.2.4",
"three": "^0.154.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"devDependencies": {
"doric": "^0.10.68",
"doric-cli": "^0.10.68",
"rollup": "^3.26.3",
"rollup": "^2.79.1",
"typescript": "^5.1.6",
"@rollup/plugin-buble": "^1.0.2",
"@rollup/plugin-commonjs": "^25.0.3",
Expand Down

0 comments on commit cc96e4b

Please sign in to comment.