fix 3D viewer

This commit is contained in:
Eugenio Romano 2017-10-23 12:18:36 +01:00
parent bc48ad59ef
commit 0039fb17ab
3 changed files with 8 additions and 5 deletions

View File

@ -42,7 +42,7 @@
"material-design-lite": "1.2.1",
"minimatch": "3.0.4",
"moment": "2.15.1",
"ng2-3d-editor": "0.0.15",
"ng2-3d-editor": "0.0.18",
"alfresco-js-api": "1.9.0",
"ng2-activiti-analytics": "1.9.0",
"ng2-activiti-diagrams": "1.9.0",

View File

@ -4,9 +4,8 @@ import { FormsModule } from '@angular/forms';
import { HttpModule } from '@angular/http';
import { MatInputModule } from '@angular/material';
import { FlexLayoutModule } from '@angular/flex-layout';
// import { Editor3DModule } from 'ng2-3d-editor';
import { Editor3DModule } from 'ng2-3d-editor';
import { ChartsModule } from 'ng2-charts';
// import { Viewer3DComponent } from './../../node_modules/ng2-3d-editor/src/componets/viewer3D.component';
import { AppConfigService, TRANSLATION_PROVIDER } from 'ng2-alfresco-core';
import { AppComponent } from './app.component';
@ -80,7 +79,7 @@ import { routing } from './app.routes';
MaterialModule,
ThemePickerModule,
FlexLayoutModule,
// Editor3DModule,
Editor3DModule,
ChartsModule,
],
providers: [

View File

@ -1,5 +1,9 @@
<ng-container *ngIf="nodeId">
<adf-viewer [fileNodeId]="nodeId">
§-->
<extension-viewer [supportedExtensions]="['obj','3DS']" #extension>
<ng-template let-urlFileContent="urlFileContent" let-extension="extension" >
<threed-viewer [urlFile]="urlFileContent" [extension]="extension" ></threed-viewer>
</ng-template>
</extension-viewer>
</adf-viewer>
</ng-container>