@@ -7,7 +7,7 @@ import { isThreeAssetComponent, ThreeAssetComponent, ThreeComponent } from "./ba
7
7
8
8
@Component
9
9
export class Scene extends Mixins ( ThreeComponent ) {
10
- @Prop ( { required : true , type : String } )
10
+ @Prop ( { type : String , default : "" } )
11
11
public name ! : string ;
12
12
13
13
@Prop ( { default : false , type : Boolean } )
@@ -45,8 +45,6 @@ export class Scene extends Mixins(ThreeComponent) {
45
45
}
46
46
47
47
public async onDeactivate ( ) {
48
- console . log ( "deactivate scene" , this . name ) ;
49
-
50
48
const manager = this . app ( ) . sceneManager ;
51
49
if ( this . m_scene === manager . active ) {
52
50
manager . active = undefined ;
@@ -59,10 +57,9 @@ export class Scene extends Mixins(ThreeComponent) {
59
57
}
60
58
61
59
public async onActivate ( ) {
62
- console . log ( "activate scene" , this . name ) ;
63
-
64
60
const manager = this . app ( ) . sceneManager ;
65
61
this . m_scene = new THREE . Scene ( ) ;
62
+ this . m_scene . name = this . name ;
66
63
manager . active = this . m_scene ;
67
64
68
65
await Vue . nextTick ( ) ;
@@ -105,36 +102,22 @@ export class Scene extends Mixins(ThreeComponent) {
105
102
}
106
103
107
104
public mounted ( ) {
108
- console . log ( "scene mounted" ) ;
109
105
this . onChangeActive ( ) ;
110
106
}
111
107
112
108
public beforeDestroy ( ) {
113
- console . log ( "scene beforeDestroy" ) ;
114
109
this . onDeactivate ( ) ;
115
110
}
116
111
117
112
public render ( h : any ) {
118
- console . log ( "scene render" ) ;
119
113
if ( ! this . m_isActive ) {
120
114
return null ;
121
115
}
122
116
123
- const whenReady = (
124
- < div >
125
- < h3 > Scene ready</ h3 >
126
- { this . $slots . default }
127
- </ div >
128
- ) ;
129
-
130
117
return (
131
- < div class = "scene" >
132
- < h2 > Scene { this . name } </ h2 >
133
- < div >
134
- < h3 > Preload</ h3 >
135
- { this . $slots . preload }
136
- </ div >
137
- { this . m_isReady ? whenReady : null }
118
+ < div >
119
+ < div > { this . $slots . preload } </ div >
120
+ < div > { this . m_isReady ? this . $slots . default : null } </ div >
138
121
</ div >
139
122
) ;
140
123
}
0 commit comments