Skip to content
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

Jump to bottom

D10-27: Avoid dynamic property references. #17

Merged
merged 2 commits into from
Nov 2, 2023
Merged

D10-27: Avoid dynamic property references. #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89adf37
Avoid dynamic property references.
adam-vessey Oct 19, 2023
6914c27
Merge remote-tracking branch 'origin/main' into fix/d10-27
adam-vessey Oct 19, 2023
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
32 changes: 16 additions & 16 deletions dgi_3d_viewer.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ function dgi_3d_viewer_media_presave(MediaInterface $media) {
$camera = $media->get('field_camera')->referencedEntities()[0] ?? NULL;

if (!$camera) {
$media->field_customcamera = NULL;
$media->set('field_customcamera', NULL);
return;
}

$camera_settings = dgi_3d_viewer_flatten_camera_values($camera);

$media->field_customcamera = serialize($camera_settings);
$media->set('field_customcamera', serialize($camera_settings));
}

/**
Expand All @@ -35,33 +35,33 @@ function dgi_3d_viewer_flatten_camera_values(ParagraphInterface $camera) {
$type = $camera->bundle();
$camera_settings = [
'settings' => [
'near' => $camera->field_near->value,
'far' => $camera->field_far->value,
'near' => $camera->get('field_near')->getValue(),
'far' => $camera->get('field_far')->getValue(),
'position' => [
'x' => $camera->field_position_x->value,
'y' => $camera->field_position_y->value,
'z' => $camera->field_position_z->value,
'x' => $camera->get('field_position_x')->getValue(),
'y' => $camera->get('field_position_y')->getValue(),
'z' => $camera->get('field_position_z')->getValue(),
],
'rotation' => [
'x' => $camera->field_rotation_x->value,
'y' => $camera->field_rotation_y->value,
'z' => $camera->field_rotation_z->value,
'x' => $camera->get('field_rotation_x')->getValue(),
'y' => $camera->get('field_rotation_y')->getValue(),
'z' => $camera->get('field_rotation_z')->getValue(),
],
],
];
switch ($type) {
case 'orthographic_camera_settings':
$camera_settings['type'] = 'OrthographicCamera';
$camera_settings['settings']['top'] = $camera->field_top->value;
$camera_settings['settings']['bottom'] = $camera->field_bottom->value;
$camera_settings['settings']['left'] = $camera->field_left->value;
$camera_settings['settings']['right'] = $camera->field_right->value;
$camera_settings['settings']['top'] = $camera->get('field_top')->getValue();
$camera_settings['settings']['bottom'] = $camera->get('field_bottom')->getValue();
$camera_settings['settings']['left'] = $camera->get('field_left')->getValue();
$camera_settings['settings']['right'] = $camera->get('field_right')->getValue();
break;

case 'perspective_camera_settings':
$camera_settings['type'] = 'PerspectiveCamera';
$camera_settings['settings']['aspect'] = $camera->field_aspect->value;
$camera_settings['settings']['fov'] = $camera->field_fov->value;
$camera_settings['settings']['aspect'] = $camera->get('field_aspect')->getValue();
$camera_settings['settings']['fov'] = $camera->get('field_fov')->getValue();
break;
}

Expand Down