Mark Sibly 8 年之前
父節點
當前提交
80a74d6bc0

+ 7 - 5
modules/mojo3d-loaders/loaders/assimp.monkey2

@@ -55,6 +55,8 @@ Class AssimpLoader
 			
 			
 			Local aimesh:=_scene.mMeshes[i]
 			Local aimesh:=_scene.mMeshes[i]
 			
 			
+			If i=0 mesh.AddMaterials( 1 )
+			
 			LoadMesh( aimesh,mesh,Null,False )
 			LoadMesh( aimesh,mesh,Null,False )
 		Next
 		Next
 		
 		
@@ -73,7 +75,7 @@ Class AssimpLoader
 			
 			
 			Local aimesh:=_scene.mMeshes[i]
 			Local aimesh:=_scene.mMeshes[i]
 			
 			
-			If i mesh.AddMaterials( 1 )
+			mesh.AddMaterials( 1 )
 				
 				
 			LoadMesh( aimesh,mesh,Null,False )
 			LoadMesh( aimesh,mesh,Null,False )
 			
 			
@@ -234,9 +236,9 @@ Class AssimpLoader
 		Local rot:=matrix.m.Scale( 1/scl.x,1/scl.y,1/scl.z )
 		Local rot:=matrix.m.Scale( 1/scl.x,1/scl.y,1/scl.z )
 		Local pos:=matrix.t
 		Local pos:=matrix.t
 
 
-		model.Position=pos
-		model.Basis=rot
-		model.Scale=scl
+		model.LocalPosition=pos
+		model.LocalBasis=rot
+		model.LocalScale=scl
 		
 		
 		_nodes[ node.mName.data ]=model
 		_nodes[ node.mName.data ]=model
 		_entityIds[ node.mName.data ]=_entities.Length
 		_entityIds[ node.mName.data ]=_entities.Length
@@ -255,7 +257,7 @@ Class AssimpLoader
 			
 			
 			Local aimesh:=_scene.mMeshes[ node.mMeshes[i] ]
 			Local aimesh:=_scene.mMeshes[ node.mMeshes[i] ]
 			
 			
-			If i mesh.AddMaterials( 1 )
+			mesh.AddMaterials( 1 )
 			
 			
 			LoadMesh( aimesh,mesh,model,boned )
 			LoadMesh( aimesh,mesh,model,boned )
 			
 			

二進制
modules/mojo3d-loaders/tests/assets/miramar-skybox.jpg


+ 4 - 1
modules/mojo3d-loaders/tests/castle.monkey2

@@ -9,6 +9,8 @@ Namespace myapp
 
 
 #Import "assets/"
 #Import "assets/"
 
 
+#Import "../../mojo3d/tests/assets/miramar-skybox.jpg"
+
 #Import "util"
 #Import "util"
 
 
 Using std..
 Using std..
@@ -55,7 +57,6 @@ Class MyWindow Extends Window
 		'create model
 		'create model
 		'		
 		'		
 		_model=Model.Load( "asset::castle/CASTLE1.X" )
 		_model=Model.Load( "asset::castle/CASTLE1.X" )
-'		_model=Model.Load( "asset::HOUSE.3DS" )
 '		_model=Model.Load( "desktop::Temple.3DS" )
 '		_model=Model.Load( "desktop::Temple.3DS" )
 '		_model=Model.Load( "desktop::FairyHouse/FairyHouse.3DS" )
 '		_model=Model.Load( "desktop::FairyHouse/FairyHouse.3DS" )
 		
 		
@@ -92,6 +93,8 @@ Class MyWindow Extends Window
 End
 End
 
 
 Function Main()
 Function Main()
+	
+	Print RealPath( "desktop::hello.png" )
 
 
 	New AppInstance
 	New AppInstance