backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

- Fixed the model reader.

Browse Source 
- Implemented missing model draw methods
- removed NotImplementedExceptions in BasicEffect.cs, to enable the model reading for testing
This commit is contained in:
SND\GinieDp_cp 2012-03-09 23:23:51 +00:00
parent bd5e03c94e
commit 352903c836
17 changed files with 241 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ANX.Framework.sln
View File

@ -138,6 +138,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaSystems", "MediaSystem
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.MediaSystem.Windows.OpenAL", "MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj", "{97185A92-077D-4498-8B6A-8BFF04079044}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelSample", "Samples\ModelSample\ModelSample\ModelSample.csproj", "{ED081799-AB02-4793-96F8-F9EA7F3192E3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -466,6 +468,16 @@ Global
{97185A92-077D-4498-8B6A-8BFF04079044}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{97185A92-077D-4498-8B6A-8BFF04079044}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{97185A92-077D-4498-8B6A-8BFF04079044}.Release|x86.ActiveCfg = Release|Any CPU
{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|Any CPU.ActiveCfg = Debug|x86
{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|Mixed Platforms.Build.0 = Debug|x86
{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|x86.ActiveCfg = Debug|x86
{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|x86.Build.0 = Debug|x86
{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|Any CPU.ActiveCfg = Release|x86
{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|Mixed Platforms.ActiveCfg = Release|x86
{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|Mixed Platforms.Build.0 = Release|x86
{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|x86.ActiveCfg = Release|x86
{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -491,6 +503,7 @@ Global
{57097B7A-A283-4409-8AAC-35BF0F458657} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
{160150D5-38E6-482D-97F5-2624F322A854} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
{9C9C6245-35C2-4230-8E17-9038A228227F} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
{ED081799-AB02-4793-96F8-F9EA7F3192E3} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
{49066074-3B7B-4A55-B122-6BD33AB73558} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
{60D08399-244F-46A3-91F1-4CFD26D961A3} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}

6
ANX.Framework/Content/ContentReader.cs
View File

@ -249,12 +249,12 @@ namespace ANX.Framework.Content
{
return default(T);
}
if (index > this.typeReaders.Length)
index -= 1;
if (index >= this.typeReaders.Length)
{
throw new ContentLoadException("Bad Xnb");
}
ContentTypeReader reader = this.typeReaders[index-1];
ContentTypeReader reader = this.typeReaders[index];
return this.ReadWithTypeReader<T>(reader, null);
}

2
ANX.Framework/Content/GraphicTypeReaders/AlphaTestEffectReader.cs
View File

@ -55,7 +55,7 @@ using ANX.Framework.Graphics;
#endregion // License
namespace ANX.Framework.Content.GraphicTypeReaders
namespace ANX.Framework.Content
{
public class AlphaTestEffectReader : ContentTypeReader<AlphaTestEffect>
{

2
ANX.Framework/Content/GraphicTypeReaders/BasicEffectReader.cs
View File

@ -55,7 +55,7 @@ using ANX.Framework.Graphics;
#endregion // License
namespace ANX.Framework.Content.GraphicTypeReaders
namespace ANX.Framework.Content
{
public class BasicEffectReader : ContentTypeReader<BasicEffect>
{

2
ANX.Framework/Content/GraphicTypeReaders/DualTextureEffectReader.cs
View File

@ -55,7 +55,7 @@ using ANX.Framework.Graphics;
#endregion // License
namespace ANX.Framework.Content.GraphicTypeReaders
namespace ANX.Framework.Content
{
public class DualTextureEffectReader : ContentTypeReader<DualTextureEffect>
{

2
ANX.Framework/Content/GraphicTypeReaders/EffectMaterialReader.cs
View File

@ -55,7 +55,7 @@ using ANX.Framework.Graphics;
#endregion // License
namespace ANX.Framework.Content.GraphicTypeReaders
namespace ANX.Framework.Content
{
public class EffectMaterialReader : ContentTypeReader<EffectMaterial>
{

2
ANX.Framework/Content/GraphicTypeReaders/EnvironmentMapEffectReader.cs
View File

@ -55,7 +55,7 @@ using ANX.Framework.Graphics;
#endregion // License
namespace ANX.Framework.Content.GraphicTypeReaders
namespace ANX.Framework.Content
{
public class EnvironmentMapEffectReader : ContentTypeReader<EnvironmentMapEffect>
{

16
ANX.Framework/Content/GraphicTypeReaders/ModelReader.cs
View File

@ -56,7 +56,7 @@ using ANX.Framework.NonXNA;
#endregion // License
namespace ANX.Framework.Content.GraphicTypeReaders
namespace ANX.Framework.Content
{
public class ModelReader : ContentTypeReader<Model>
{
@ -90,7 +90,7 @@ namespace ANX.Framework.Content.GraphicTypeReaders
ModelBone[] bones = new ModelBone[boneCount];
for (int i = 0; i < boneCount; i++)
{
string name = reader.ReadString();
string name = reader.ReadObject<String>();
Matrix transform = reader.ReadMatrix();
bones[i] = new ModelBone(name, transform, i);
}
@ -123,14 +123,14 @@ namespace ANX.Framework.Content.GraphicTypeReaders
{
index = (int)reader.ReadInt32();
}
return index;
return index - 1;
}
private ModelBone ReadBoneReference(ContentReader reader, ModelBone[] bones)
{
ModelBone reference = null;
int index = ReadBoneIndex(reader, bones.Length);
if (index != 0)
if (index >= 0 && index < bones.Length)
{
reference = bones[index];
}
@ -141,7 +141,7 @@ namespace ANX.Framework.Content.GraphicTypeReaders
{
ModelBone reference = null;
int index = ReadBoneIndex(reader, bones.Count);
if (index != 0)
if (index >= 0)
{
reference = bones[index];
}
@ -154,9 +154,11 @@ namespace ANX.Framework.Content.GraphicTypeReaders
ModelMesh[] meshes = new ModelMesh[meshCount];
for (int i = 0; i < meshCount; i++)
{
string name = reader.ReadString();
string name = reader.ReadObject<String>();
ModelBone parentBone = ReadBoneReference(reader, bones);
BoundingSphere boundingSphere = reader.ReadObject<BoundingSphere>();
BoundingSphere boundingSphere = new BoundingSphere();
boundingSphere.Center = reader.ReadVector3();
boundingSphere.Radius = reader.ReadSingle();
object meshTag = reader.ReadObject<object>();
int meshPartCount = reader.ReadInt32();

2
ANX.Framework/Content/GraphicTypeReaders/SkinnedEffectReader.cs
View File

@ -55,7 +55,7 @@ using ANX.Framework.Graphics;
#endregion // License
namespace ANX.Framework.Content.GraphicTypeReaders
namespace ANX.Framework.Content
{
public class SkinnedEffectReader : ContentTypeReader<SkinnedEffect>
{

2
ANX.Framework/Content/GraphicTypeReaders/TextureCubeReader.cs
View File

@ -54,7 +54,7 @@ using ANX.Framework.NonXNA;
#endregion // License
namespace ANX.Framework.Content.GraphicTypeReaders
namespace ANX.Framework.Content
{
internal class TextureCubeReader : ContentTypeReader<TextureCube>
{

2
ANX.Framework/Content/GraphicTypeReaders/VertexBufferReader.cs
View File

@ -60,7 +60,7 @@ namespace ANX.Framework.Content
protected internal override VertexBuffer Read(ContentReader input, VertexBuffer existingInstance)
{
GraphicsDevice graphics = input.ResolveGraphicsDevice();
VertexDeclaration declaration = input.ReadObject<VertexDeclaration>();
VertexDeclaration declaration = input.ReadRawObject<VertexDeclaration>();
int vertexCount = input.ReadInt32();
byte[] data = new byte[vertexCount * declaration.VertexStride];
for (int i = 0; i < data.Length; i++)

73
ANX.Framework/Graphics/BasicEffect.cs
View File

@ -84,11 +84,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return false;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -137,11 +138,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return Vector3.One;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -164,11 +166,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return false;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -176,11 +179,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return Vector3.One;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -188,11 +192,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return false;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -200,11 +205,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return 0;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -212,11 +218,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return 0;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -224,11 +231,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return null;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -236,11 +244,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return false;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -248,11 +257,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return Vector3.One;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -260,11 +270,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return Vector3.One;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -272,11 +283,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return Vector3.One;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -284,11 +296,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return 16;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -296,11 +309,12 @@ namespace ANX.Framework.Graphics
{
get
{
throw new NotImplementedException();
return 1;
//throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
//throw new NotImplementedException();
}
}
@ -332,7 +346,8 @@ namespace ANX.Framework.Graphics
return;
}
throw new InvalidOperationException("Currently ANX's BasicEffect only supports VertexColor technique");
this.CurrentTechnique = Techniques["VertexColor"];
//throw new InvalidOperationException("Currently ANX's BasicEffect only supports VertexColor technique");
}
}
}

6
ANX.Framework/Graphics/EffectPassCollection.cs
View File

@ -101,17 +101,17 @@ namespace ANX.Framework.Graphics
IEnumerator<EffectPass> IEnumerable<EffectPass>.GetEnumerator()
{
throw new NotImplementedException();
return (IEnumerator<EffectPass>)this.passes.GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator()
{
throw new NotImplementedException();
return (IEnumerator)this.passes.GetEnumerator();
}
public List<EffectPass>.Enumerator GetEnumerator()
{
throw new NotImplementedException();
return this.passes.GetEnumerator();
}
public int Count

80
ANX.Framework/Graphics/Model.cs
View File

@ -83,6 +83,8 @@ namespace ANX.Framework.Graphics
set { tag = value; }
}
private static Matrix[] cachedBonesArray;
public Model(ModelBoneCollection bones, ModelMeshCollection meshes, ModelBone rootBone, Object tag)
{
this.bones = bones;
@ -93,22 +95,92 @@ namespace ANX.Framework.Graphics
public void CopyAbsoluteBoneTransformsTo(Matrix[] destinationBoneTransforms)
{
throw new NotImplementedException();
if (destinationBoneTransforms == null)
{
throw new ArgumentNullException("destinationBoneTransforms");
}
if (destinationBoneTransforms.Length < bones.Count)
{
throw new ArgumentOutOfRangeException("destinationBoneTransforms");
}
for (int i = 0; i < bones.Count; i++)
{
var bone = bones[i];
if (bone.Parent == null)
{
destinationBoneTransforms[i] = bone.Transform;
}
else
{
int parentIndex = bone.Parent.Index;
destinationBoneTransforms[i] = bone.Transform * destinationBoneTransforms[parentIndex];
}
}
}
public void CopyBoneTransformsFrom(Matrix[] sourceBoneTransforms)
{
throw new NotImplementedException();
if (sourceBoneTransforms == null)
{
throw new ArgumentNullException("sourceBoneTransforms");
}
if (sourceBoneTransforms.Length < bones.Count)
{
throw new ArgumentOutOfRangeException("sourceBoneTransforms");
}
for (int i = 0; i < bones.Count; i++)
{
bones[i].Transform = sourceBoneTransforms[i];
}
}
public void CopyBoneTransformsTo(Matrix[] destinationBoneTransforms)
{
throw new NotImplementedException();
if (destinationBoneTransforms == null)
{
throw new ArgumentNullException("destinationBoneTransforms");
}
if (destinationBoneTransforms.Length < bones.Count)
{
throw new ArgumentOutOfRangeException("destinationBoneTransforms");
}
for (int i = 0; i < bones.Count; i++)
{
destinationBoneTransforms[i] = bones[i].Transform;
}
}
public void Draw (Matrix world, Matrix view, Matrix projection)
{
throw new NotImplementedException();
Matrix[] absTransforms = Model.cachedBonesArray;
if (absTransforms == null || absTransforms.Length < this.bones.Count)
{
Array.Resize<Matrix>(ref absTransforms, this.bones.Count);
Model.cachedBonesArray = absTransforms;
}
this.CopyAbsoluteBoneTransformsTo(absTransforms);
foreach (var mesh in meshes)
{
foreach (var effect in mesh.Effects)
{
IEffectMatrices matEffect = effect as IEffectMatrices;
if (matEffect != null)
{
matEffect.World = absTransforms[mesh.ParentBone.Index] * world;
matEffect.View = view;
matEffect.Projection = projection;
}
}
mesh.Draw();
}
}
}
}

26
ANX.Framework/Graphics/ModelEffectCollection.cs
View File

@ -57,12 +57,12 @@ namespace ANX.Framework.Graphics
{
public sealed class ModelEffectCollection : ReadOnlyCollection<Effect>
{
private Effect[] effects;
private List<Effect> effects;
internal ModelEffectCollection(Effect[] effects)
: base(effects)
internal ModelEffectCollection()
: base(new List<Effect>())
{
this.effects = effects;
this.effects = base.Items as List<Effect>;
}
public new Enumerator GetEnumerator()
@ -70,12 +70,22 @@ namespace ANX.Framework.Graphics
return new Enumerator(this.effects);
}
public void Add(Effect effect)
{
base.Items.Add(effect);
}
public void Remove(Effect effect)
{
base.Items.Remove(effect);
}
public struct Enumerator : IEnumerator<Effect>, IDisposable, IEnumerator
{
private Effect[] wrappedArray;
private List<Effect> wrappedArray;
private int position;
internal Enumerator(Effect[] wrappedArray)
internal Enumerator(List<Effect> wrappedArray)
{
this.wrappedArray = wrappedArray;
this.position = -1;
@ -92,9 +102,9 @@ namespace ANX.Framework.Graphics
public bool MoveNext()
{
this.position++;
if (this.position >= this.wrappedArray.Length)
if (this.position >= this.wrappedArray.Count)
{
this.position = this.wrappedArray.Length;
this.position = this.wrappedArray.Count;
return false;
}
return true;

57
ANX.Framework/Graphics/ModelMesh.cs
View File

@ -105,11 +105,66 @@ namespace ANX.Framework.Graphics
this.boundingSphere = sphere;
this.tag = tag;
this.meshParts = new ModelMeshPartCollection(meshParts);
this.effects = new ModelEffectCollection();
foreach (var item in this.meshParts)
{
item.parentMesh = this;
if (item.Effect != null && !this.effects.Contains(item.Effect))
{
this.effects.Add(item.Effect);
}
}
}
internal void EffectChangedOnMeshPart(ModelMeshPart part, Effect oldEffect, Effect newEffect)
{
bool oldEffectIsInUse = false;
bool newEffectIsKnown = false;
foreach (var item in meshParts)
{
if (object.ReferenceEquals(item, part))
{
continue;
}
if (object.ReferenceEquals(item.Effect, oldEffect))
{
oldEffectIsInUse = true;
}
if (object.ReferenceEquals(item.Effect, newEffect))
{
newEffectIsKnown = true;
}
}
if (oldEffect != null && !oldEffectIsInUse)
{
effects.Remove(oldEffect);
}
if (newEffect != null && !newEffectIsKnown)
{
effects.Add(oldEffect);
}
}
public void Draw()
{
throw new NotImplementedException();
foreach (var part in meshParts)
{
foreach (var pass in part.Effect.CurrentTechnique.Passes)
{
pass.Apply();
GraphicsDevice graphics = part.VertexBuffer.GraphicsDevice;
graphics.SetVertexBuffer(part.VertexBuffer, part.VertexOffset);
graphics.Indices = part.IndexBuffer;
graphics.DrawIndexedPrimitives(PrimitiveType.TriangleList, 0, 0, part.NumVertices, part.StartIndex, part.PrimitiveCount);
}
}
}
}
}

12
ANX.Framework/Graphics/ModelMeshPart.cs
View File

@ -54,12 +54,22 @@ namespace ANX.Framework.Graphics
{
public sealed class ModelMeshPart
{
internal ModelMesh parentMesh;
private Effect effect;
public Effect Effect
{
get { return effect; }
set { this.effect = value; }
set
{
if (this.effect != value)
{
var old = this.effect;
this.effect = value;
this.parentMesh.EffectChangedOnMeshPart(this, old, value);
}
}
}
private IndexBuffer indexBuffer;