Move Reactor type definitions to Reactor.hpp.

docs/Reactor.md

@@ -109,7 +109,7 @@ Note that bytes are unsigned unless prefixed with S, while larger integers are s
 
 These scalar types support all of the C++ arithmetic operations.
 
-Reactor also supports several vector types. For example ```Float4``` is a vector of four floats. They support a select number of C++ operators, and several "intrinsic" functions such as ```Max()``` to compute the element-wise maximum and return a bit mask. Check [Nucleus.hpp](../src/Reactor/Nucleus.hpp) for all the types, operators and intrinsics.
+Reactor also supports several vector types. For example ```Float4``` is a vector of four floats. They support a select number of C++ operators, and several "intrinsic" functions such as ```Max()``` to compute the element-wise maximum and return a bit mask. Check [Reactor.hpp](../src/Reactor/Reactor.hpp) for all the types, operators and intrinsics.
 
 ### Casting and Reinterpreting
 

src/Main/FrameBuffer.hpp

@@ -15,7 +15,7 @@
 #ifndef	sw_FrameBuffer_hpp
 #define	sw_FrameBuffer_hpp
 
-#include "Reactor/Nucleus.hpp"
+#include "Reactor/Reactor.hpp"
 #include "Renderer/Surface.hpp"
 #include "Common/Thread.hpp"
 

src/Reactor/x86.hpp

@@ -12,7 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "Nucleus.hpp"
+#ifndef sw_x86_hpp
+#define sw_x86_hpp
+
+#include "Reactor.hpp"
 
 namespace sw
 {
@@ -153,3 +156,5 @@ namespace sw
 		void emms();
 	}
 }
+
+#endif   // sw_x86_hpp
\ No newline at end of file

src/Renderer/Blitter.hpp

@@ -17,7 +17,7 @@
 
 #include "Surface.hpp"
 #include "RoutineCache.hpp"
-#include "Reactor/Nucleus.hpp"
+#include "Reactor/Reactor.hpp"
 
 #include <string.h>
 

src/Shader/SamplerCore.hpp

@@ -16,7 +16,7 @@
 #define sw_SamplerCore_hpp
 
 #include "PixelRoutine.hpp"
-#include "Reactor/Nucleus.hpp"
+#include "Reactor/Reactor.hpp"
 
 namespace sw
 {

src/Shader/SetupRoutine.hpp

@@ -16,7 +16,7 @@
 #define sw_SetupRoutine_hpp
 
 #include "SetupProcessor.hpp"
-#include "Reactor/Nucleus.hpp"
+#include "Reactor/Reactor.hpp"
 
 namespace sw
 {