Skip to content

UV map properties #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 21, 2018
Merged

UV map properties #151

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ae4694
Add propTypes for UV properties
bnjm Feb 20, 2018
8cc9790
Add constants for texture wrapping
bnjm Feb 20, 2018
88c2b8d
Implement support for texture properties
bnjm Feb 20, 2018
f293838
Clean up
bnjm Feb 21, 2018
320a7b1
Merge branch 'master' into uv-map-properties
bnjm Feb 21, 2018
f9c8565
Update README.md
bnjm Feb 21, 2018
d2ddd3d
Fix typos
bnjm Feb 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Clean up
  • Loading branch information
@bnjm
bnjm committed Feb 21, 2018
commit f293838d6974b53e394d9c86ff1c3e66fff18701
7 changes: 2 additions & 5 deletions ios/RCTConvert+ARKit.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,18 +333,15 @@ + (void)setMaterialPropertyContents:(id)property material:(SCNMaterialProperty *
}

if (property[@"rotation"]) {
float angle = [property[@"rotation"][@"angle"] floatValue];
float a = [property[@"rotation"][@"angle"] floatValue];
float x = [property[@"rotation"][@"x"] floatValue];
float y = [property[@"rotation"][@"y"] floatValue];
float z = [property[@"rotation"][@"z"] floatValue];

m = SCNMatrix4Mult(m, SCNMatrix4MakeRotation(angle, x, y, z));
m = SCNMatrix4Mult(m, SCNMatrix4MakeRotation(a, x, y, z));
}

if (property[@"scale"]) {

NSLog(@"%@", property[@"scale"]);

float x = [property[@"scale"][@"x"] floatValue];
float y = [property[@"scale"][@"y"] floatValue];
float z = [property[@"scale"][@"z"] floatValue];
Expand Down