Skip to content

Commit 911aa75

Browse files
authored
Remove legacy scenec stuff from flutter_tool (flutter#163569)
o7 Removes the legacy scenec logic from flutter_tool. We removed scenec from the engine/shipped artifacts long ago. Originally added in flutter#118157. This has since been replaced by [flutter_scene_importer](https://pub.dev/packages/flutter_scene_importer/versions)!
1 parent 6018856 commit 911aa75

File tree

18 files changed

+3
-300
lines changed

18 files changed

+3
-300
lines changed

packages/flutter_tools/lib/src/artifacts.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ enum HostArtifact {
122122

123123
// The Impeller shader compiler.
124124
impellerc,
125-
// The Impeller Scene 3D model importer.
126-
scenec,
127125
// Impeller's tessellation library.
128126
libtessellator,
129127
}
@@ -264,8 +262,6 @@ String _hostArtifactToFileName(HostArtifact artifact, Platform platform) {
264262
return 'dart_sdk.js.map';
265263
case HostArtifact.impellerc:
266264
return 'impellerc$exe';
267-
case HostArtifact.scenec:
268-
return 'scenec$exe';
269265
case HostArtifact.libtessellator:
270266
return 'libtessellator$dll';
271267
}
@@ -480,7 +476,6 @@ class CachedArtifacts implements Artifacts {
480476
final String artifactFileName = _hostArtifactToFileName(artifact, _platform);
481477
return _cache.getArtifactDirectory('usbmuxd').childFile(artifactFileName);
482478
case HostArtifact.impellerc:
483-
case HostArtifact.scenec:
484479
case HostArtifact.libtessellator:
485480
final String artifactFileName = _hostArtifactToFileName(artifact, _platform);
486481
final String engineDir =
@@ -1147,7 +1142,6 @@ class CachedLocalEngineArtifacts implements Artifacts {
11471142
final String artifactFileName = _hostArtifactToFileName(artifact, _platform);
11481143
return _cache.getArtifactDirectory('usbmuxd').childFile(artifactFileName);
11491144
case HostArtifact.impellerc:
1150-
case HostArtifact.scenec:
11511145
case HostArtifact.libtessellator:
11521146
final String artifactFileName = _hostArtifactToFileName(artifact, _platform);
11531147
final File file = _fileSystem.file(
@@ -1506,7 +1500,6 @@ class CachedLocalWebSdkArtifacts implements Artifacts {
15061500
case HostArtifact.iproxy:
15071501
case HostArtifact.skyEnginePath:
15081502
case HostArtifact.impellerc:
1509-
case HostArtifact.scenec:
15101503
case HostArtifact.libtessellator:
15111504
return _parent.getHostArtifact(artifact);
15121505
}

packages/flutter_tools/lib/src/asset.dart

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ abstract class AssetBundleFactory {
7272
AssetBundle createBundle();
7373
}
7474

75-
enum AssetKind { regular, font, shader, model }
75+
enum AssetKind { regular, font, shader }
7676

7777
/// Contains all information about an asset needed by tool the to prepare and
7878
/// copy an asset file to the build output.
@@ -959,22 +959,6 @@ class ManifestAssetBundle implements AssetBundle {
959959
);
960960
}
961961

962-
for (final Uri modelUri in flutterManifest.models) {
963-
_parseAssetFromFile(
964-
packageConfig,
965-
flutterManifest,
966-
assetBase,
967-
cache,
968-
result,
969-
modelUri,
970-
packageName: packageName,
971-
attributedPackage: attributedPackage,
972-
assetKind: AssetKind.model,
973-
flavors: <String>{},
974-
transformers: <AssetTransformerEntry>[],
975-
);
976-
}
977-
978962
// Add assets referenced in the fonts section of the manifest.
979963
for (final Font font in flutterManifest.fonts) {
980964
for (final FontAsset fontAsset in font.fontAssets) {

packages/flutter_tools/lib/src/build_system/targets/assets.dart

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import '../build_system.dart';
1616
import '../depfile.dart';
1717
import '../exceptions.dart';
1818
import '../tools/asset_transformer.dart';
19-
import '../tools/scene_importer.dart';
2019
import '../tools/shader_compiler.dart';
2120
import 'common.dart';
2221
import 'icon_tree_shaker.dart';
@@ -83,12 +82,6 @@ Future<Depfile> copyAssets(
8382
fileSystem: environment.fileSystem,
8483
artifacts: environment.artifacts,
8584
);
86-
final SceneImporter sceneImporter = SceneImporter(
87-
processManager: environment.processManager,
88-
logger: environment.logger,
89-
fileSystem: environment.fileSystem,
90-
artifacts: environment.artifacts,
91-
);
9285
final AssetTransformer assetTransformer = AssetTransformer(
9386
processManager: environment.processManager,
9487
fileSystem: environment.fileSystem,
@@ -160,12 +153,6 @@ Future<Depfile> copyAssets(
160153
outputPath: file.path,
161154
targetPlatform: targetPlatform,
162155
);
163-
case AssetKind.model:
164-
doCopy =
165-
!await sceneImporter.importScene(
166-
input: content.file as File,
167-
outputPath: file.path,
168-
);
169156
}
170157
if (doCopy) {
171158
await (content.file as File).copy(file.path);

packages/flutter_tools/lib/src/build_system/tools/scene_importer.dart

Lines changed: 0 additions & 151 deletions
This file was deleted.

packages/flutter_tools/lib/src/bundle_builder.dart

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import 'build_info.dart';
1515
import 'build_system/build_system.dart';
1616
import 'build_system/depfile.dart';
1717
import 'build_system/tools/asset_transformer.dart';
18-
import 'build_system/tools/scene_importer.dart';
1918
import 'build_system/tools/shader_compiler.dart';
2019
import 'bundle.dart';
2120
import 'cache.dart';
@@ -166,13 +165,6 @@ Future<void> writeBundle(
166165
artifacts: artifacts,
167166
);
168167

169-
final SceneImporter sceneImporter = SceneImporter(
170-
processManager: processManager,
171-
logger: logger,
172-
fileSystem: fileSystem,
173-
artifacts: artifacts,
174-
);
175-
176168
final AssetTransformer assetTransformer = AssetTransformer(
177169
processManager: processManager,
178170
fileSystem: fileSystem,
@@ -225,8 +217,6 @@ Future<void> writeBundle(
225217
outputPath: file.path,
226218
targetPlatform: targetPlatform,
227219
);
228-
case AssetKind.model:
229-
doCopy = !await sceneImporter.importScene(input: input, outputPath: file.path);
230220
}
231221
if (doCopy) {
232222
input.copySync(file.path);

packages/flutter_tools/lib/src/commands/widget_preview.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
525525

526526
final List<Uri> shaders = rootManifest.shaders.map(transformAssetUri).toList();
527527

528-
final List<Uri> models = rootManifest.models.map(transformAssetUri).toList();
529-
530528
final List<DeferredComponent>? deferredComponents =
531529
rootManifest.deferredComponents?.map(transformDeferredComponent).toList();
532530

@@ -535,7 +533,6 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
535533
assets: assets,
536534
fonts: fonts,
537535
shaders: shaders,
538-
models: models,
539536
deferredComponents: deferredComponents,
540537
);
541538
}

packages/flutter_tools/lib/src/devfs.dart

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import 'base/net.dart';
1919
import 'base/os.dart';
2020
import 'build_info.dart';
2121
import 'build_system/tools/asset_transformer.dart';
22-
import 'build_system/tools/scene_importer.dart';
2322
import 'build_system/tools/shader_compiler.dart';
2423
import 'compile.dart';
2524
import 'convert.dart' show base64, utf8;
@@ -476,7 +475,6 @@ class DevFS {
476475
final Directory rootDirectory;
477476
final Set<String> assetPathsToEvict = <String>{};
478477
final Set<String> shaderPathsToEvict = <String>{};
479-
final Set<String> scenePathsToEvict = <String>{};
480478

481479
// A flag to indicate whether we have called `setAssetDirectory` on the target device.
482480
bool hasSetAssetDirectory = false;
@@ -564,7 +562,6 @@ class DevFS {
564562
required PackageConfig packageConfig,
565563
required String dillOutputPath,
566564
required DevelopmentShaderCompiler shaderCompiler,
567-
DevelopmentSceneImporter? sceneImporter,
568565
DevFSWriter? devFSWriter,
569566
String? target,
570567
AssetBundle? bundle,
@@ -654,23 +651,6 @@ class DevFS {
654651
shaderPathsToEvict.add(archivePath);
655652
}
656653
});
657-
case AssetKind.model:
658-
if (sceneImporter == null) {
659-
break;
660-
}
661-
final Future<DevFSContent?> pending = sceneImporter.reimportScene(entry.content);
662-
pendingAssetBuilds.add(pending);
663-
pending.then((DevFSContent? content) {
664-
if (content == null) {
665-
assetBuildFailed = true;
666-
return;
667-
}
668-
dirtyEntries[deviceUri] = content;
669-
syncedBytes += content.size;
670-
if (!bundleFirstUpload) {
671-
scenePathsToEvict.add(archivePath);
672-
}
673-
});
674654
case AssetKind.regular:
675655
case AssetKind.font:
676656
case null:

0 commit comments

Comments
 (0)