Welcome, Guest! Log In | Create Account

Changeset 1899

Show
Ignore:
Timestamp:
11/18/09 16:48:23 (3 months ago)
Author:
borrillis
Message:

- Xna/Xbox

  • update projects for crickhollow
  • modified classes for Xbox .Net Framework
Location:
trunk/Projects/Axiom
Files:
16 modified

Legend:

Unmodified
Added
Removed

  • trunk/Projects/Axiom/Engine/Axiom.Xbox.csproj

    r1663 r1899  
    6464    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, processorArchitecture=MSIL"> 
    6565      <SpecificVersion>False</SpecificVersion> 
    66       <HintPath>..\..\..\..\Lib\Managed\CompactFramework\ICSharpCode.SharpZipLib\0.85.4.369\ICSharpCode.SharpZipLib.dll</HintPath> 
     66      <HintPath>..\..\..\Lib\Managed\CompactFramework\ICSharpCode.SharpZipLib\0.85.4.369\ICSharpCode.SharpZipLib.dll</HintPath> 
    6767    </Reference> 
    6868    <Reference Include="Microsoft.Xna.Framework"> 
    … …  
    8686      <Link>Properties\GlobalAssemblyInfo.cs</Link> 
    8787    </Compile> 
     88    <Compile Include="Animating\Animable.cs" /> 
    8889    <Compile Include="Animating\Animation.cs" /> 
    8990    <Compile Include="Animating\AnimationState.cs" /> 
     91    <Compile Include="Animating\AnimationStateSet.cs" /> 
    9092    <Compile Include="Animating\AnimationTrack.cs" /> 
     93    <Compile Include="Animating\AttachmentPoint.cs" /> 
    9194    <Compile Include="Animating\Bone.cs" /> 
     95    <Compile Include="Animating\Collections\AnimationCollection.cs" /> 
     96    <Compile Include="Animating\Collections\AnimationStateCollection.cs" /> 
     97    <Compile Include="Animating\Collections\AnimationTrackCollection.cs" /> 
     98    <Compile Include="Animating\Collections\BoneCollection.cs" /> 
     99    <Compile Include="Animating\Collections\Lists.cs" /> 
    92100    <Compile Include="Animating\Enums.cs" /> 
    93101    <Compile Include="Animating\KeyFrame.cs" /> 
     102    <Compile Include="Animating\Pose.cs" /> 
    94103    <Compile Include="Animating\Skeleton.cs" /> 
    95104    <Compile Include="Animating\SkeletonInstance.cs" /> 
    96105    <Compile Include="Animating\SkeletonManager.cs" /> 
    97106    <Compile Include="Animating\TagPoint.cs" /> 
    98     <Compile Include="Collections\AnimationCollection.cs" /> 
    99     <Compile Include="Collections\AnimationStateCollection.cs" /> 
    100     <Compile Include="Collections\AnimationTrackCollection.cs" /> 
    101107    <Compile Include="Collections\AxiomCollection.cs" /> 
    102     <Compile Include="Collections\BillboardSetCollection.cs" /> 
    103     <Compile Include="Collections\BoneCollection.cs" /> 
    104     <Compile Include="Collections\CameraCollection.cs" /> 
    105     <Compile Include="Collections\ConfigOptionCollection.cs" /> 
    106     <Compile Include="Collections\EntityCollection.cs" /> 
    107     <Compile Include="Collections\HashList.cs" /> 
     108    <Compile Include="Collections\Deque.cs" /> 
    108109    <Compile Include="Collections\KeyFrameCollection.cs" /> 
    109     <Compile Include="Collections\LightCollection.cs" /> 
    110     <Compile Include="Collections\Lists.cs" /> 
    111     <Compile Include="Collections\Map.cs" /> 
    112110    <Compile Include="Collections\MeshCollection.cs" /> 
    113     <Compile Include="Collections\MovableObjectCollection.cs" /> 
     111    <Compile Include="Collections\MultiMap.cs" /> 
     112    <Compile Include="Collections\NamedParameterList.cs" /> 
    114113    <Compile Include="Collections\NameValuePairList.cs" /> 
    115     <Compile Include="Collections\NodeCollection.cs" /> 
    116     <Compile Include="Collections\RenderSystemCollection.cs" /> 
    117     <Compile Include="Collections\RenderTargetCollection.cs" /> 
    118     <Compile Include="Collections\RenderWindowCollection.cs" /> 
    119     <Compile Include="Collections\SceneNodeCollection.cs" /> 
    120     <Compile Include="Collections\SceneQueryMovableObjectIntersectionList.cs" /> 
    121     <Compile Include="Collections\SceneQueryMovableObjectWorldFragmentIntersectionList.cs" /> 
     114    <Compile Include="Collections\RadixSort.cs" /> 
    122115    <Compile Include="Collections\SubEntityCollection.cs" /> 
    123     <Compile Include="Collections\ViewportCollection.cs" /> 
    124116    <Compile Include="Configuration\Config.cs" /> 
    125117    <Compile Include="Configuration\ConfigOption.cs" /> 
    … …  
    129121    <Compile Include="Controllers\Canned\MultiplyControllerFunction.cs" /> 
    130122    <Compile Include="Controllers\Canned\NodeRotationControllerValue.cs" /> 
     123    <Compile Include="Controllers\Canned\PassthroughControllerFunction.cs" /> 
    131124    <Compile Include="Controllers\Canned\TexCoordModifierControllerValue.cs" /> 
    132125    <Compile Include="Controllers\Canned\TextureFrameControllerValue.cs" /> 
    … …  
    138131    <Compile Include="Controllers\IControllerFunction.cs" /> 
    139132    <Compile Include="Controllers\IControllerValue.cs" /> 
     133    <Compile Include="Core\AbstractFactory~1.cs" /> 
    140134    <Compile Include="Core\AxiomException.cs" /> 
    141135    <Compile Include="Core\Billboard.cs" /> 
     136    <Compile Include="Core\BillboardChain.cs" /> 
    142137    <Compile Include="Core\BillboardSet.cs" /> 
     138    <Compile Include="Core\BitConverterEx.cs" /> 
    143139    <Compile Include="Core\Camera.cs" /> 
    144     <Compile Include="Core\Collections.cs" /> 
     140    <Compile Include="Core\ChainedEvent.cs" /> 
     141    <Compile Include="Core\Collections\CameraCollection.cs" /> 
     142    <Compile Include="Core\Collections\Lists.cs" /> 
     143    <Compile Include="Core\Collections\MovableObjectCollection.cs" /> 
     144    <Compile Include="Core\Collections\NodeCollection.cs" /> 
     145    <Compile Include="Core\Collections\SceneManagerCollection.cs" /> 
     146    <Compile Include="Core\Collections\SceneNodeCollection.cs" /> 
     147    <Compile Include="Core\Collections\SceneQueryMovableObjectIntersectionList.cs" /> 
     148    <Compile Include="Core\Collections\SceneQueryMovableObjectWorldFragmentIntersectionList.cs" /> 
     149    <Compile Include="Core\Collections\ViewportCollection.cs" /> 
    145150    <Compile Include="Core\ColorEx.cs" /> 
    146151    <Compile Include="Core\CoreEnums.cs" /> 
     152    <Compile Include="Core\DefaultShadowCameraSetup.cs" /> 
     153    <Compile Include="Core\DistanceLodStrategy.cs" /> 
    147154    <Compile Include="Core\Entity.cs" /> 
    148155    <Compile Include="Core\Frustum.cs" /> 
     156    <Compile Include="Core\IAbstractFactory~1.cs" /> 
    149157    <Compile Include="Core\IConfigurable.cs" /> 
     158    <Compile Include="Core\ILodListener.cs" /> 
    150159    <Compile Include="Core\IPlatformManager.cs" /> 
    151160    <Compile Include="Core\IPlugin.cs" /> 
     161    <Compile Include="Core\IShadowCameraSetup.cs" /> 
    152162    <Compile Include="Core\ITimer.cs" /> 
    153163    <Compile Include="Core\Light.cs" /> 
     164    <Compile Include="Core\LodStrategy.cs" /> 
     165    <Compile Include="Core\LodStrategyManager.cs" /> 
    154166    <Compile Include="Core\Log.cs" /> 
    155167    <Compile Include="Core\LogManager.cs" /> 
     168    <Compile Include="Core\ManualObject.cs" /> 
    156169    <Compile Include="Core\Memory.cs" /> 
    157170    <Compile Include="Core\Mesh.cs" /> 
    158171    <Compile Include="Core\MeshManager.cs" /> 
     172    <Compile Include="Core\Meters.cs" /> 
    159173    <Compile Include="Core\MovableObject.cs" /> 
    160174    <Compile Include="Core\MovableText.cs" /> 
     175    <Compile Include="Core\NameGenerator~1.cs" /> 
    161176    <Compile Include="Core\Node.cs" /> 
    162177    <Compile Include="Core\ObjectCreator.cs" /> 
    163178    <Compile Include="Core\ObjectTextDisplay.cs" /> 
     179    <Compile Include="Core\Pair.cs" /> 
    164180    <Compile Include="Core\PatchMesh.cs" /> 
    165181    <Compile Include="Core\PatchSurface.cs" /> 
     182    <Compile Include="Core\PixelCountStrategy.cs" /> 
    166183    <Compile Include="Core\PlatformInformation.cs" /> 
    167184    <Compile Include="Core\PlatformManager.cs" /> 
    168185    <Compile Include="Core\PluginException.cs" /> 
    169186    <Compile Include="Core\PluginManager.cs" /> 
     187    <Compile Include="Core\PrefabFactory.cs" /> 
     188    <Compile Include="Core\ProgressiveMesh.cs" /> 
    170189    <Compile Include="Core\Rectangle.cs" /> 
    171190    <Compile Include="Core\Resource.cs" /> 
    … …  
    174193    <Compile Include="Core\Root.cs" /> 
    175194    <Compile Include="Core\SceneManager.cs" /> 
    176     <Compile Include="Core\SceneManagerList.cs" /> 
     195    <Compile Include="Core\SceneManagerEnumerator.cs" /> 
    177196    <Compile Include="Core\SceneNode.cs" /> 
    178197    <Compile Include="Core\SceneQuery.cs" /> 
     198    <Compile Include="Core\ShadowTextureManager.cs" /> 
     199    <Compile Include="Core\Singleton.cs" /> 
     200    <Compile Include="Core\SpecialCaseRenderQueue.cs" /> 
     201    <Compile Include="Core\StaticGeometry\GeometryBucket.cs" /> 
     202    <Compile Include="Core\StaticGeometry\LODBucket.cs" /> 
     203    <Compile Include="Core\StaticGeometry\MaterialBucket.cs" /> 
     204    <Compile Include="Core\StaticGeometry\Region.cs" /> 
     205    <Compile Include="Core\StaticGeometry\StaticGeometry.cs" /> 
    179206    <Compile Include="Core\StringConverter.cs" /> 
    180207    <Compile Include="Core\SubEntity.cs" /> 
    … …  
    184211    <Compile Include="Core\Timer.cs" /> 
    185212    <Compile Include="Core\Viewport.cs" /> 
     213    <Compile Include="Core\WindowEventMonitor.cs" /> 
    186214    <Compile Include="Core\WireBoundingBox.cs" /> 
    187215    <Compile Include="FileSystem\Archive.cs" /> 
    188216    <Compile Include="FileSystem\ArchiveManager.cs" /> 
    189     <Compile Include="FileSystem\Folder.cs" /> 
    190     <Compile Include="FileSystem\FolderFactory.cs" /> 
    191     <Compile Include="FileSystem\IArchiveFactory.cs" /> 
    192     <Compile Include="FileSystem\Zip.cs" /> 
    193     <Compile Include="FileSystem\ZipFactory.cs" /> 
     217    <Compile Include="FileSystem\FileSystemArchive.cs" /> 
     218    <Compile Include="FileSystem\Watcher.cs"> 
     219      <SubType>Code</SubType> 
     220    </Compile> 
     221    <Compile Include="FileSystem\ZipArchive.cs" /> 
    194222    <Compile Include="Fonts\Font.cs" /> 
    195     <Compile Include="Fonts\FontEnums.cs" /> 
    196223    <Compile Include="Fonts\FontManager.cs" /> 
     224    <Compile Include="Graphics\AnyBuilder.cs" /> 
    197225    <Compile Include="Graphics\AutoParamDataSource.cs" /> 
    198226    <Compile Include="Graphics\BufferStream.cs" /> 
    199     <Compile Include="Graphics\Collections.cs" /> 
     227    <Compile Include="Graphics\Collections\ConfigOptionCollection.cs" /> 
     228    <Compile Include="Graphics\Collections\Lists.cs" /> 
     229    <Compile Include="Graphics\Collections\RenderPriorityGroupList.cs" /> 
     230    <Compile Include="Graphics\Collections\RenderSystemCollection.cs" /> 
     231    <Compile Include="Graphics\Collections\RenderTargetCollection.cs" /> 
     232    <Compile Include="Graphics\Collections\RenderWindowCollection.cs" /> 
     233    <Compile Include="Graphics\CompositionPass.cs" /> 
     234    <Compile Include="Graphics\CompositionTargetPass.cs" /> 
     235    <Compile Include="Graphics\CompositionTechnique.cs" /> 
     236    <Compile Include="Graphics\Compositor.cs" /> 
     237    <Compile Include="Graphics\CompositorChain.cs" /> 
     238    <Compile Include="Graphics\CompositorInstance.cs" /> 
     239    <Compile Include="Graphics\CompositorManager.cs" /> 
     240    <Compile Include="Graphics\DefaultHardwareIndexBuffer.cs" /> 
     241    <Compile Include="Graphics\DefaultHardwareVertexBuffer.cs" /> 
    200242    <Compile Include="Graphics\EdgeData.cs" /> 
    201243    <Compile Include="Graphics\EdgeListBuilder.cs" /> 
    … …  
    203245    <Compile Include="Graphics\GpuProgram.cs" /> 
    204246    <Compile Include="Graphics\GpuProgramManager.cs" /> 
     247    <Compile Include="Graphics\GpuProgramParameters.AutoConstants.cs" /> 
     248    <Compile Include="Graphics\GpuProgramParameters.ConstantEntry.cs" /> 
    205249    <Compile Include="Graphics\GpuProgramParameters.cs" /> 
     250    <Compile Include="Graphics\GpuProgramParameters.GpuConstantDefinition.cs" /> 
     251    <Compile Include="Graphics\GpuProgramParameters.NamedConstants.cs" /> 
     252    <Compile Include="Graphics\GpuProgramParameters.SharedParameters.cs" /> 
    206253    <Compile Include="Graphics\GpuProgramUsage.cs" /> 
    207254    <Compile Include="Graphics\HardwareBuffer.cs" /> 
    … …  
    209256    <Compile Include="Graphics\HardwareCaps.cs" /> 
    210257    <Compile Include="Graphics\HardwareIndexBuffer.cs" /> 
     258    <Compile Include="Graphics\HardwarePixelBuffer.cs" /> 
    211259    <Compile Include="Graphics\HardwareVertexBuffer.cs" /> 
    212260    <Compile Include="Graphics\HighLevelGpuProgram.cs" /> 
    … …  
    218266    <Compile Include="Graphics\MaterialManager.cs" /> 
    219267    <Compile Include="Graphics\MovablePlane.cs" /> 
     268    <Compile Include="Graphics\MultiRenderTarget.cs" /> 
    220269    <Compile Include="Graphics\Pass.cs" /> 
     270    <Compile Include="Graphics\QueuedRenderableCollection.cs" /> 
    221271    <Compile Include="Graphics\Rectangle2D.cs" /> 
    222272    <Compile Include="Graphics\RenderOperation.cs" /> 
    … …  
    224274    <Compile Include="Graphics\RenderQueue.cs" /> 
    225275    <Compile Include="Graphics\RenderQueueGroup.cs" /> 
     276    <Compile Include="Graphics\RenderQueueInvocation.cs" /> 
     277    <Compile Include="Graphics\RenderQueueInvocationSequence.cs" /> 
    226278    <Compile Include="Graphics\RenderSystem.cs" /> 
    227279    <Compile Include="Graphics\RenderTarget.cs" /> 
    228280    <Compile Include="Graphics\RenderTexture.cs" /> 
    229281    <Compile Include="Graphics\RenderWindow.cs" /> 
     282    <Compile Include="Graphics\RibbonTrail.cs" /> 
    230283    <Compile Include="Graphics\ShadowCaster.cs" /> 
    231284    <Compile Include="Graphics\ShadowRenderable.cs" /> 
    … …  
    238291    <Compile Include="Graphics\TempBlendedBufferInfo.cs" /> 
    239292    <Compile Include="Graphics\TextureUnitState.cs" /> 
     293    <Compile Include="Graphics\TriangleBuilder.cs" /> 
     294    <Compile Include="Graphics\UnifiedHighLevelGpuProgram.cs" /> 
    240295    <Compile Include="Graphics\VertexBufferBinding.cs" /> 
    241296    <Compile Include="Graphics\VertexBufferLicense.cs" /> 
    … …  
    254309    <Compile Include="Math\Collections\QuaternionCollection.cs" /> 
    255310    <Compile Include="Math\Collections\Vector3Collection.cs" /> 
     311    <Compile Include="Math\Degree.cs" /> 
    256312    <Compile Include="Math\Enums.cs" /> 
    257313    <Compile Include="Math\Matrix3.cs" /> 
    … …  
    261317    <Compile Include="Math\PositionalSpline.cs" /> 
    262318    <Compile Include="Math\Quaternion.cs" /> 
     319    <Compile Include="Math\Radian.cs" /> 
    263320    <Compile Include="Math\Ray.cs" /> 
     321    <Compile Include="Math\Real.cs" /> 
    264322    <Compile Include="Math\RotationalSpline.cs" /> 
    265323    <Compile Include="Math\Sphere.cs" /> 
     324    <Compile Include="Math\Spline.cs" /> 
     325    <Compile Include="Math\Tuple.cs" /> 
    266326    <Compile Include="Math\Utility.cs" /> 
    267327    <Compile Include="Math\Vector2.cs" /> 
    268328    <Compile Include="Math\Vector3.cs" /> 
    269329    <Compile Include="Math\Vector4.cs" /> 
     330    <Compile Include="Media\Bitwise.cs" /> 
    270331    <Compile Include="Media\CodecManager.cs" /> 
    271332    <Compile Include="Media\Enums.cs" /> 
    … …  
    273334    <Compile Include="Media\Image.cs" /> 
    274335    <Compile Include="Media\ImageCodec.cs" /> 
     336    <Compile Include="Media\LinearResampler.Byte.cs" /> 
     337    <Compile Include="Media\LinearResampler.cs" /> 
     338    <Compile Include="Media\LinearResampler.Float32.cs" /> 
     339    <Compile Include="Media\NearestResampler.cs" /> 
     340    <Compile Include="Media\OptimizedPixelConversion.cs" /> 
     341    <Compile Include="Media\PixelBox.cs" /> 
     342    <Compile Include="Media\PixelConverter.cs" /> 
     343    <Compile Include="Media\PixelUtil.cs" /> 
    275344    <Compile Include="Overlays\Elements\BorderPanel.cs" /> 
    276345    <Compile Include="Overlays\Elements\Factories.cs" /> 
    … …  
    284353    <Compile Include="Overlays\OverlayElementManager.cs" /> 
    285354    <Compile Include="Overlays\OverlayManager.cs" /> 
     355    <Compile Include="ParticleSystems\BillboardParticleRenderer.cs" /> 
    286356    <Compile Include="ParticleSystems\Collections.cs" /> 
     357    <Compile Include="ParticleSystems\Collections\Lists.cs" /> 
    287358    <Compile Include="ParticleSystems\Particle.cs" /> 
    288359    <Compile Include="ParticleSystems\ParticleAffector.cs" /> 
    … …  
    297368    <Compile Include="Properties\AssemblyInfo.cs" /> 
    298369    <Compile Include="Scripting\CommandAttribute.cs" /> 
    299     <Compile Include="Scripting\ICommand.cs" /> 
     370    <Compile Include="Scripting\IPropertyCommand.cs" /> 
     371    <Compile Include="Scripting\IScriptLoader.cs" /> 
    300372    <Compile Include="Scripting\ParseHelper.cs" /> 
     373    <Compile Include="Scripting\ParserCommandAttribute.cs" /> 
     374    <Compile Include="Scripting\ScriptableObject.cs" /> 
    301375    <Compile Include="Scripting\ScriptEnumAttribute.cs" /> 
    302376    <Compile Include="Serialization\Enums.cs" /> 
    … …  
    306380    <Compile Include="Serialization\OgreSkeletonReader.cs" /> 
    307381    <Compile Include="Serialization\Serializer.cs" /> 
    308     <Compile Include="Text\TextManager.cs" /> 
     382    <Compile Include="Serialization\StreamSerializer.cs" /> 
    309383    <Compile Include="Utilities\Contract.cs" /> 
    310384    <Compile Include="Utilities\Exceptions.cs" /> 
    … …  
    312386  </ItemGroup> 
    313387  <ItemGroup> 
    314     <None Include="Axiom.Engine.build" /> 
    315   </ItemGroup> 
    316   <ItemGroup> 
    317388    <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> 
    318389      <Visible>False</Visible> 
    … …  
    348419  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 
    349420  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.targets" Condition="" /> 
    350 </Project>XNA Game Studio\Microsoft.Xna.GameStudio.targets" Condition="" /> 
    351421</Project> 

  • trunk/Projects/Axiom/Engine/Axiom.csproj

    r1886 r1899  
    7979  <ItemGroup> 
    8080    <Reference Include="System" /> 
    81     <Reference Include="System.Data" /> 
    8281    <Reference Include="System.Drawing" /> 
    8382    <Reference Include="System.Xml" /> 

  • trunk/Projects/Axiom/Engine/Core/ResourceGroupManager.cs

    r1825 r1899  
    295295        /// <summary>Map of loading order (Real) to ScriptLoader, used to order script parsing</summary> 
    296296        //          typedef std::multimap<Real, ScriptLoader*> ScriptLoaderOrderMap; 
    297         public class ScriptLoaderOrderMap : SortedDictionary<float, List<IScriptLoader>> 
     297        public class ScriptLoaderOrderMap : AxiomSortedCollection<float, List<IScriptLoader>> 
    298298        { 
    299299        }; 

  • trunk/Projects/Axiom/Engine/Core/Singleton.cs

    r1663 r1899  
    8181                                        return SingletonFactory.instance; 
    8282                                } 
    83                                 catch ( TypeInitializationException ) 
     83                                catch ( /*TypeInitialization*/Exception ) 
    8484                                { 
    8585                                        throw new Exception( string.Format( "Type {0} must implement a private parameterless constructor.", typeof( T ) ) ); 

  • trunk/Projects/Axiom/Engine/Core/StringConverter.cs

    r1824 r1899  
    9393                #region String.Split() replacements 
    9494 
    95 #if !XBOX360 
    96  
     95#if !( XBOX || XBOX360 ) 
    9796                public static string[] Split( string s, char[] separators ) 
    9897                { 
    … …  
    104103                        return s.Split( separators, count, StringSplitOptions.None ); 
    105104                } 
    106  
    107105#else 
     106 
     107                public static string[] Split( string s, char[] separators, int count ) 
     108                { 
     109                        return Split(s, separators, count, StringSplitOptions.None ); 
     110                } 
    108111 
    109112                public static string[] Split( string s, char[] separators ) 
    … …  
    232235                        } 
    233236                } 
    234  
    235237#endif 
    236238                #endregion 

  • trunk/Projects/Axiom/Engine/FileSystem/FileSystemArchive.cs

    r1887 r1899  
    9696                        if ( pattern == "" ) 
    9797                                pattern = "*"; 
    98  
     98            if ( currentDir == "") currentDir = _basePath; 
     99 
     100#if !( XBOX || XBOX360 ) 
    99101            SearchOption so; 
    100  
    101             if ( currentDir == "") currentDir = _basePath; 
    102  
    103102            if ( recursive ) 
    104103            { 
    … …  
    111110 
    112111            foreach( string file in Directory.GetFiles( currentDir , pattern, so) ) 
     112#else 
     113            foreach( string file in Directory.GetFiles( currentDir, pattern ) ) 
     114#endif 
    113115            { 
    114116                System.IO.FileInfo fi = new System.IO.FileInfo( file ); 
    … …  
    195197            try 
    196198            { 
     199#if !( XBOX || XBOX360 ) 
    197200                File.Create(_basePath + @"__testWrite.Axiom", 1, FileOptions.DeleteOnClose); 
     201#else 
     202                File.Create(_basePath + @"__testWrite.Axiom", 1 ); 
     203#endif 
    198204            } 
    199205            catch (Exception ex) 
    … …  
    225231                try 
    226232                { 
     233#if !( XBOX || XBOX360 ) 
    227234                    stream = File.Create( fullPath, 1, FileOptions.RandomAccess ); 
     235#else 
     236                    stream = File.Create( fullPath, 1 ); 
     237#endif 
    228238                } 
    229239                catch( Exception ex ) 

  • trunk/Projects/Axiom/Engine/FileSystem/Watcher.cs

    r1716 r1899  
    4747    { 
    4848        #region Fields and Properties 
    49  
     49#if !( XBOX || XBOX360 ) 
    5050        private readonly FileSystemWatcher _monitor; 
    51  
     51#endif 
    5252        #endregion Fields and Properties 
    5353 
    … …  
    5656        public Watcher(string path, bool recurse) 
    5757        { 
     58#if !( XBOX || XBOX360 ) 
    5859            // Initialize FileSystemWatcher 
    5960            this._monitor = new FileSystemWatcher(); 
    … …  
    7374            // Begin watching. 
    7475            this._monitor.EnableRaisingEvents = true; 
    75  
     76#endif 
    7677            LogManager.Instance.Write( "File monitor created for {0}.", path ); 
    7778        } 
    … …  
    8081 
    8182        #region Methods 
     83#if !( XBOX || XBOX360 ) 
    8284 
    8385        private static void OnChanged(object source, FileSystemEventArgs e) 
    … …  
    9294            LogManager.Instance.Write( "File: {0} renamed to {1}", e.OldFullPath, e.FullPath ); 
    9395        } 
    94  
     96#endif 
    9597        #endregion Methods 
    9698    } 

  • trunk/Projects/Axiom/Engine/Fonts/Font.cs

    r1788 r1899  
    3636using System; 
    3737using System.Collections.Generic; 
    38 using System.Drawing; 
    39 using System.Drawing.Text; 
    40  
    41 using Axiom.FileSystem; 
    42  
    43 using SDI = System.Drawing.Imaging; 
    4438using System.IO; 
    4539using System.Runtime.InteropServices; 
    … …  
    4943using Axiom.Graphics; 
    5044using Axiom.Media; 
     45using Axiom.FileSystem; 
    5146 
    5247using ResourceHandle = System.UInt64; 
    … …  
    495490                if (_fontType == FontType.TrueType) 
    496491                { 
     492#if !( XBOX || XBOX360 ) 
    497493                    // create the font bitmap on the fly 
    498494                    createTexture(); 
    … …  
    502498 
    503499                    blendByAlpha = true; 
     500#endif 
    504501                } 
    505502                else 
    … …  
    561558                        // TODO : Revisit after checking current Imaging support in Mono. 
    562559 
     560#if !( XBOX || XBOX360 ) 
    563561                        // create a new bitamp with the size defined 
    564562                        System.Drawing.Bitmap bitmap = new System.Drawing.Bitmap( BITMAP_WIDTH, BITMAP_HEIGHT, System.Drawing.Imaging.PixelFormat.Format32bppArgb ); 
    … …  
    569567                    // load the font from file into a private collection to make sure 
    570568                    // this works even if the font is not installed 
    571                     FontFamily fontFamily; 
     569                    System.Drawing.FontFamily fontFamily; 
    572570                    string fontFile = String.Empty; 
    573571                    IntPtr pData = IntPtr.Zero; 
    … …  
    577575                        using ( Stream fileStream = Singleton<ResourceGroupManager>.Instance.OpenResource( this.Source, Group ) ) 
    578576                        { 
    579                             using ( PrivateFontCollection fontCollection = new PrivateFontCollection() ) 
     577                            using ( System.Drawing.Text.PrivateFontCollection fontCollection = new System.Drawing.Text.PrivateFontCollection() ) 
    580578                            { 
    581579                                data = new byte[fileStream.Length]; 
    … …  
    594592                        LogManager.Instance.Write( error ); 
    595593 
    596                         fontFamily = FontFamily.GenericSansSerif; 
     594                        fontFamily = System.Drawing.FontFamily.GenericSansSerif; 
    597595                    } 
    598596                    finally 
    … …  
    676674                                g.DrawLine( linePen, 0, y + font.Height, BITMAP_WIDTH, y + font.Height ); 
    677675                        } 
    678                          
    679                         SDI.BitmapData bmd = bitmap.LockBits( new System.Drawing.Rectangle( 0, 0, BITMAP_WIDTH, BITMAP_HEIGHT ), SDI.ImageLockMode.ReadOnly, SDI.PixelFormat.Format32bppArgb ); 
     676 
     677            System.Drawing.Imaging.BitmapData bmd = bitmap.LockBits( new System.Drawing.Rectangle( 0, 0, BITMAP_WIDTH, BITMAP_HEIGHT ), System.Drawing.Imaging.ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb ); 
    680678 
    681679                        byte[] imgData = new byte[ PixelUtil.GetNumElemBytes( PixelFormat.A8R8G8B8 ) * BITMAP_WIDTH * BITMAP_HEIGHT ]; 
    … …  
    710708                        //str.Close(); 
    711709                        //file.Close(); 
     710#endif 
    712711                } 
    713712 

  • trunk/Projects/Axiom/Engine/Graphics/QueuedRenderableCollection.cs

    r1663 r1899  
    213213 
    214214                /// Grouped  
    215                 SortedDictionary<Pass, List<IRenderable>> _grouped = new SortedDictionary<Pass, List<IRenderable>>( new PassGroupComparer() ); 
     215        AxiomSortedCollection<Pass, List<IRenderable>> _grouped = new AxiomSortedCollection<Pass, List<IRenderable>>( new PassGroupComparer() ); 
    216216 
    217217                /// Sorted descending (can iterate backwards to get ascending) 

  • trunk/Projects/Axiom/Engine/Math/Degree.cs

    r1881 r1899  
    5757    /// </remarks> 
    5858    [StructLayout( LayoutKind.Sequential )] 
     59#if !( XBOX || XBOX360 ) 
    5960    [Serializable] 
    6061    public struct Degree : ISerializable, IComparable<Degree>, IComparable<Radian>, IComparable<Real> 
     62#else 
     63    public struct Degree : IComparable<Degree>, IComparable<Radian>, IComparable<Real> 
     64#endif 
    6165        { 
    6266        private static readonly Real _degreesToRadians = Utility.PI / 180.0f; 
    … …  
    104108        public override int GetHashCode() { return _value.GetHashCode(); } 
    105109 
     110#if !( XBOX || XBOX360 ) 
     111        #region ISerializable Implementation 
    106112        private Degree( SerializationInfo info, StreamingContext context ) { _value = (Real)info.GetValue( "value", typeof( Real ) ); } 
    107113 
    108114        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] 
    109115        public void GetObjectData( SerializationInfo info, StreamingContext context ) { info.AddValue( "value", _value ); } 
     116        #endregion ISerializableImplementation 
     117#endif 
    110118 
    111119        #region IComparable<T> Members 

  • trunk/Projects/Axiom/Engine/Math/Radian.cs

    r1881 r1899  
    5757    /// </remarks> 
    5858    [StructLayout( LayoutKind.Sequential )] 
    59         public struct Radian : ISerializable, IComparable< Radian>, IComparable< Degree >, IComparable< Real > 
     59#if !( XBOX || XBOX360 ) 
     60    [Serializable] 
     61        public struct Radian : ISerializable, IComparable<Radian>, IComparable<Degree>, IComparable<Real> 
     62#else 
     63    public struct Radian : IComparable<Radian>, IComparable<Degree>, IComparable<Real> 
     64#endif 
    6065        { 
    6166        private static readonly Real _radiansToDegrees = 180.0f / Utility.PI; 
    … …  
    103108        public override int GetHashCode() { return _value.GetHashCode(); } 
    104109 
     110#if !( XBOX || XBOX360 ) 
     111        #region ISerializable Implementation 
    105112        private Radian( SerializationInfo info, StreamingContext context ) { _value = (Real)info.GetValue( "value", typeof( Real ) ); } 
    106113 
    107114        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] 
    108115        public void GetObjectData( SerializationInfo info, StreamingContext context ) { info.AddValue( "value", _value ); } 
    109  
     116        #endregion ISerializableImplementation 
     117#endif 
    110118 
    111119        #region IComparable<T> Members 

  • trunk/Projects/Axiom/Engine/Math/Real.cs

    r1828 r1899  
    5959    /// </remarks> 
    6060    [StructLayout( LayoutKind.Sequential )] 
     61#if !( XBOX || XBOX360 ) 
    6162    [Serializable] 
    6263    public struct Real : ISerializable, IComparable<Real>, IConvertible 
    63     { 
     64#else 
     65    public struct Real : IComparable<Real>, IConvertible 
     66#endif 
     67{ 
    6468        #region Fields 
    6569        /// <summary> 
    … …  
    647651        #endregion System.Object Overrides 
    648652 
     653#if !( XBOX || XBOX360 ) 
    649654        #region ISerializable Implementation 
    650655 
    … …  
    671676 
    672677        #endregion ISerializable Implementation 
     678#endif 
    673679 
    674680        #region IComparable<Real> Members 

  • trunk/Projects/Axiom/Engine/Scripting/ScriptEnumAttribute.cs

    r1855 r1899  
    129129 
    130130        /// <summary> 
    131         /// Looksup the script attibute for the enumeration value 
     131        /// Looks up the script attibute for the enumeration value 
    132132        /// </summary> 
    133133        /// <param name="enumValue">The enumeration value</param> 
    … …  
    144144                FieldInfo field = fields[ i ]; 
    145145                if ( type == field.FieldType.UnderlyingSystemType &&  
    146                     (int)field.GetRawConstantValue() == enumValue ) 
     146                    (int)field.GetValue(null) == enumValue ) 
    147147                { 
    148148                    // find custom attributes declared for this field 

  • trunk/Projects/Axiom/Engine/Scripting/ScriptableObject.cs

    r1855 r1899  
    6767                    { 
    6868                        var pca = attribute as CommandAttribute; 
     69#if !( XBOX || XBOX360 || SILVERLIGHT ) 
    6970                        if ( commandClass.GetInterface( typeof( IPropertyCommand ).Name ) != null ) 
    7071                        { 
     72#else 
     73                        bool typeFound = false; 
     74                        for ( int i = 0; i < commandClass.GetInterfaces().GetLength( 0 ); i++ ) 
     75                        { 
     76                            if ( type.GetInterfaces()[ i ] == typeof( IPropertyCommand ) ) 
     77                            { 
     78                                typeFound = true; 
     79                                break; 
     80                            } 
     81                        } 
     82 
     83                        if ( typeFound ) 
     84                        { 
     85#endif 
    7186                            object commandInstance = Activator.CreateInstance( commandClass ); 
    7287                            var propertyCommand = commandInstance as IPropertyCommand; 

  • trunk/Projects/Axiom/Engine/Serialization/StreamSerializer.cs

    r1749 r1899  
    656656            byte[] buffer = new byte[length]; 
    657657            this.ReadData( buffer, buffer.Length, 1 ); 
    658             data = encoding.GetString( buffer ); 
     658            data = encoding.GetString( buffer, 0, buffer.Length ); 
    659659        } 
    660660 

  • trunk/Projects/Axiom/Plugins/ParticleFX/Axiom.Plugins.ParticleFX.Xbox.csproj

    r1548 r1899  
    1 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> 
     1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> 
    22  <PropertyGroup> 
    33    <ProjectType>Local</ProjectType> 
    … …  
    6464      <Name>System</Name> 
    6565      <HintPath>\System.dll</HintPath> 
    66     </Reference> 
    67     <Reference Include="System.Data"> 
    68       <Name>System.Data</Name> 
    69       <HintPath>\System.Data.dll</HintPath> 
    7066    </Reference> 
    7167    <Reference Include="System.Xml"> 

Copyright © 2010 Geeknet, Inc. All rights reserved. Terms of Use