Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixing skybox

  • Loading branch information...
commit 7fd7dcedaa556bdf91216c73127a1ea0d7392852 1 parent 4e3d4ea
@mcgrue authored
View
1  DemonDoor/DemonDoor/DemonDoor.csproj.Debug.cachefile
@@ -18,4 +18,3 @@ Content\art\cloud_07.xnb
Content\art\cloud_08.xnb
Content\art\cloud_09.xnb
Content\art\demon.xnb
-Content\art\evil_window.xnb
View
2  DemonDoor/DemonDoor/DemonSprite.cs
@@ -40,7 +40,7 @@ public enum AnimationState {
return createFilmstrip(new[] { frame });
}
- private Filmstrip createFilmstrip(IList<int> frames, bool randomizedStartFrame = false) {
+ private Filmstrip createFilmstrip(IList<int> frames, bool randomizedStartFrame = false ) {
return new Filmstrip(new Point(9, 19), frames, 150, randomizedStartFrame);
}
View
38 DemonDoor/DemonDoor/DoorController.cs
@@ -48,8 +48,7 @@ private bool PhysicsCollided(Fixture f1, Fixture f2, Contact contact)
other = f1;
}
- if (other.UserData is CivvieController && !_alreadyShot.Contains(other))
- {
+ if (other.UserData is CivvieController && !_alreadyShot.Contains(other)) {
CivvieController c = other.UserData as CivvieController;
//Console.WriteLine("collided with corpse {0}, kickin' it", c);
@@ -60,44 +59,34 @@ private bool PhysicsCollided(Fixture f1, Fixture f2, Contact contact)
return false;
}
- private void PhysicsSeparated(Fixture f1, Fixture f2)
- {
+ private void PhysicsSeparated(Fixture f1, Fixture f2) {
Fixture self = null, other = null;
- if (f1 == _fsFixture)
- {
+ if (f1 == _fsFixture) {
self = f1;
other = f2;
- }
- else if (f2 == _fsFixture)
- {
+ } else if (f2 == _fsFixture) {
self = f2;
other = f1;
}
- if (_alreadyShot.Contains(other))
- {
+ if (_alreadyShot.Contains(other)) {
_alreadyShot.Remove(other);
}
}
- private bool BehaviorCollided(Fixture f1, Fixture f2, Contact contact)
- {
+ private bool BehaviorCollided(Fixture f1, Fixture f2, Contact contact) {
Fixture self = null, other = null;
- if (f1 == _fsFixture)
- {
+ if (f1 == _fsFixture) {
self = f1;
other = f2;
- }
- else if (f2 == _fsFixture)
- {
+ } else if (f2 == _fsFixture) {
self = f2;
other = f1;
}
- if (other.UserData is ICollidable)
- {
+ if (other.UserData is ICollidable) {
this.Collided(other.UserData as ICollidable);
(other.UserData as ICollidable).Collided(this);
}
@@ -105,15 +94,12 @@ private bool BehaviorCollided(Fixture f1, Fixture f2, Contact contact)
return false;
}
- public void Collided(ICollidable other)
- {
+ public void Collided(ICollidable other) {
}
- public Vector2 Position
- {
- get
- {
+ public Vector2 Position {
+ get {
return _fsBody.Position;
}
}
View
BIN  DemonDoor/DemonDoorContent/art/skybox.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  DemonDoor/DemonDoorContent/obj/x86/Debug/ContentPipeline.xml
@@ -89,7 +89,7 @@
<Processor>TextureProcessor</Processor>
<Options>None</Options>
<Output>C:\grue\demon_door\DemonDoor\DemonDoor\bin\x86\Debug\Content\art\skybox.xnb</Output>
- <Time>2012-03-31T18:30:17.623-07:00</Time>
+ <Time>2012-04-01T00:06:12.115-07:00</Time>
</Item>
<Item>
<Source>art\cloud_01.png</Source>
Please sign in to comment.
Something went wrong with that request. Please try again.