Skip to content
This repository has been archived by the owner on Feb 18, 2022. It is now read-only.

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@fonsp
fonsp committed Feb 13, 2015
1 parent 629a443 commit da37946
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
7 changes: 3 additions & 4 deletions GraphicsEngine/Collision/CollisionBox.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,14 @@ public float Intersect(CollisionRay ray)
t.Y = Max(-1, _rt.Y / -r.Y);
}
// Z
if(r.Z < 0)
if(r.Z > 0)
{
t.Z = Max(-1, _lb.Z / r.Z);
t.Z = Max(-1, _lb.Z / -r.Z);
}
else
{
t.Z = Max(-1, _rt.Z / r.Z);
t.Z = Max(-1, _rt.Z / -r.Z);
}
r.Z *= -1; // why?

// The largest hit distance must be that of the hit plane
if(t.X >= t.Y && t.X >= t.Z)
Expand Down
2 changes: 1 addition & 1 deletion GraphicsEngine/Hud/HudDebug.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public HudDebug(string name)
NewField("fps", 0, AlignMode.Left, "", " fps");
NewField("position", 1, AlignMode.Left, "Camera: (", ")");

NewField("version", 3, AlignMode.Left, "ReSim v0.2.0; github.com/fons-/resim", "");
NewField("version", 3, AlignMode.Left, "ReSim v1.1.0; github.com/fons-/resim", "");
NewField("cpuVendor", 4, AlignMode.Left, "CPU: ", "");
foreach(ManagementObject service in new ManagementObjectSearcher("select * from Win32_Processor").Get())
{
Expand Down
8 changes: 4 additions & 4 deletions GraphicsEngine/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
[assembly: AssemblyTitle("GraphicsLibrary")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("GraphicsLibrary")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
8 changes: 4 additions & 4 deletions Resim/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle("Resim")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Resim")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2014")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]

0 comments on commit da37946

Please sign in to comment.