maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change transform order for relative setPosition to SRT

Browse Source
This commit is contained in:
Nick Fisher
2024-02-05 08:43:54 +08:00
parent 48a1c6dc0b
commit 6561af6825
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ios/src/AssetManager.cpp
View File

@@ -1211,7 +1211,9 @@ namespace polyvox
decomposeMatrix(transform, &translation, &rotation, &scale); decomposeMatrix(transform, &translation, &rotation, &scale);
if(relative) { if(relative) {
translation += math::float3( x, y, z ); math::mat3f rotationMatrix(rotation);
math::float3 relativeTranslation = rotationMatrix * math::float3( x, y, z );
translation += relativeTranslation;
} else { } else {
translation = math::float3(x,y,z); translation = math::float3(x,y,z);
} }
@@ -1251,6 +1253,7 @@ namespace polyvox
transform = composeMatrix(translation, rotation, scale); transform = composeMatrix(translation, rotation, scale);
tm.setTransform(transformInstance, transform); tm.setTransform(transformInstance, transform);
} }
const utils::Entity *AssetManager::getCameraEntities(EntityId entity) const utils::Entity *AssetManager::getCameraEntities(EntityId entity)

3
lib/entities/entity_transform_controller.dart
View File

@@ -73,7 +73,7 @@ class EntityTransformController {
updateTranslation = true; updateTranslation = true;
} }
// todo - better to use pitch/yaw/roll // TODO - use pitch/yaw/roll
bool updateRotation = false; bool updateRotation = false;
var _rotation = v.Quaternion.identity(); var _rotation = v.Quaternion.identity();
@@ -92,7 +92,6 @@ class EntityTransformController {
relative: true); relative: true);
} }
if (updateRotation) { if (updateRotation) {
var axis = _rotation.axis;
await controller.setRotationQuat(_entity, _rotation, relative: true); await controller.setRotationQuat(_entity, _rotation, relative: true);
} }
} }

2
lib/filament_controller_ffi.dart
View File

@@ -1,6 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'dart:ffi'; import 'dart:ffi';
import 'dart:io'; import 'dart:io';
import 'dart:math';
import 'dart:ui' as ui; import 'dart:ui' as ui;
import 'dart:developer' as dev; import 'dart:developer' as dev;
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@@ -1056,6 +1057,7 @@ class FilamentControllerFFI extends FilamentController {
if (_viewer == null) { if (_viewer == null) {
throw Exception("No viewer available, ignoring"); throw Exception("No viewer available, ignoring");
} }
set_position(_assetManager!, entity, x, y, z, relative); set_position(_assetManager!, entity, x, y, z, relative);
} }