这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/three_js_advanced_loaders/lib/gltf/gltf_parser.dart
Original file line number Diff line number Diff line change
Expand Up @@ -892,8 +892,8 @@ class GLTFParser {

if (materialDef["normalTexture"]["scale"] != null) {
materialParams["normalScale"] = Vector2(
materialDef["normalTexture"]['scale'],
materialDef["normalTexture"]['scale']);
materialDef["normalTexture"]["scale"],
materialDef["normalTexture"]["scale"]);
}
}

Expand Down
10 changes: 7 additions & 3 deletions packages/three_js_core/lib/others/three_viewer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class ThreeJS with WidgetsBindingObserver{
bool visible = true;

FlutterAngleTexture? texture;
late final RenderingContext gl;
RenderingContext? gl;

core.WebGLRenderTarget? renderTarget;
core.WebGLRenderer? renderer;
Expand Down Expand Up @@ -301,7 +301,9 @@ class ThreeJS with WidgetsBindingObserver{
}

Future<void> initScene() async{
initRenderer();
if (renderer == null) {
initRenderer();
}
await setup?.call();
mounted = true;
ticker = Ticker(animate);
Expand All @@ -327,7 +329,9 @@ class ThreeJS with WidgetsBindingObserver{
}

console.info(texture?.toMap());
gl = texture!.getContext();
if (gl == null) {
gl = texture!.getContext();
}
await initScene();
}

Expand Down
4 changes: 2 additions & 2 deletions packages/three_js_core/lib/renderers/web_gl_renderer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class WebGLRenderer {
bool reverseDepthBuffer = false;

bool renderBackground = false;
late WebGLRenderList? currentRenderList;
late WebGLRenderState? currentRenderState;
WebGLRenderList? currentRenderList;
WebGLRenderState? currentRenderState;

// render() can be called from within a callback triggered by another render.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'dart:typed_data';
//import 'dart:ui' as ui;
import 'package:web/web.dart' as html;
import 'dart:convert';
import 'dart:ui' as ui;
import 'package:three_js_core/three_js_core.dart';

import '../utils/blob.dart';
Expand Down Expand Up @@ -66,15 +67,15 @@ html.HTMLImageElement setDimensions(html.HTMLImageElement imageElement, String?
return imageElement;
}

// Future<List>? _getDimensions(Uint8List bytes) async{
// final codec = await ui.instantiateImageCodec(bytes);
// final frameInfo = await codec.getNextFrame();
// final width = frameInfo.image.width;
// final height = frameInfo.image.height;
// frameInfo.image.dispose();
Future<List>? _getDimensions(Uint8List bytes) async{
final codec = await ui.instantiateImageCodec(bytes);
final frameInfo = await codec.getNextFrame();
final width = frameInfo.image.width;
final height = frameInfo.image.height;
frameInfo.image.dispose();

// return [width, height];
// }
return [width, height];
}

List? _getJpegDimensions(Uint8List bytes) {
// Verify the JPEG header (SOI marker)
Expand Down Expand Up @@ -120,11 +121,11 @@ Future<html.HTMLImageElement> createImageElementFromBytes(Uint8List bytes, [Stri
// Create an ImageElement and set its source to the data URL
html.HTMLImageElement imageElement = html.HTMLImageElement();
imageElement.src = dataUrl;
//int start = DateTime.now().millisecondsSinceEpoch;
//print(DateTime.now());
List? dimensions = _getJpegDimensions(bytes);//await _getDimensions(bytes);//
//print(DateTime.now().millisecondsSinceEpoch-start);
//imageElement = setDimensions(imageElement, dimensions);
// int start = DateTime.now().millisecondsSinceEpoch;
// print(start);
List? dimensions = await _getDimensions(bytes);
// print(DateTime.now().millisecondsSinceEpoch-start);
// imageElement = setDimensions(imageElement, dimensions);
if (dimensions != null) {
console.verbose("extracted dimension width ${dimensions[0]} and height ${dimensions[1]}");
imageElement.width = dimensions[0];
Expand Down Expand Up @@ -152,8 +153,8 @@ Future<ImageElement?> processImage(Uint8List? bytes, String? url, bool flipY) as
url: url,
data: imageElement,
width: imageElement.width,
height: imageElement.height
)
height: imageElement.height,
),
);
}
else{
Expand Down
Loading