rename files to english names

AlphaFeld.cpp → AlphaField.cpp

@@ -1,14 +1,14 @@
-#include "AlphaFeld.h"
+#include "AlphaField.h"
 
-#include "Bild.h"
-#include "Punkt.h"
+#include "Image.h"
+#include "Point.h"
 #include "Scroll.h"
 #include "Text.h"
 #include "ToolTip.h"
 
 using namespace Framework;
 
-// Content of the AlphaFeld class from AlphaFeld.h
+// Content of the AlphaFeld class from AlphaField.h
 // Constructor
 AlphaFeld::AlphaFeld()
     : Zeichnung(),

AlphaFeld.h → AlphaField.h

@@ -1,11 +1,11 @@
 #ifndef AlphaFeld_H
 #define AlphaFeld_H
 
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
-    class Bild;      //! Bild.h
+    class Bild;      //! Image.h
     class AlphaFeld; //! from this file
 
     //! A 2D GUI Framework drawing that represents a color gradient

Animation.cpp

@@ -1,9 +1,9 @@
 #include "Animation.h"
 
-#include "Bild.h"
-#include "DateiSystem.h"
-#include "InitDatei.h"
-#include "Rahmen.h"
+#include "Image.h"
+#include "FileSystem.h"
+#include "InitFile.h"
+#include "Border.h"
 #include "Text.h"
 #include "ToolTip.h"
 

Animation.h

@@ -2,14 +2,14 @@
 #define Animation_H
 
 #include "Critical.h"
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
-    class Bild;      //! Bild.h
-    class LTDBDatei; //! DateiSystem.h
-    class InitDatei; //! InitDatei.h
-    class Rahmen;    //! Rahmen.h
+    class Bild;      //! Image.h
+    class LTDBDatei; //! FileSystem.h
+    class InitDatei; //! InitFile.h
+    class Rahmen;    //! Border.h
 
     //! Contains all images of a video animation
     class Animation2DData : public virtual ReferenceCounter

Rahmen.cpp → Border.cpp

@@ -1,14 +1,14 @@
-#include "Rahmen.h"
+#include "Border.h"
 
-#include "Bild.h"
-#include "Punkt.h"
+#include "Image.h"
+#include "Point.h"
 #include "Scroll.h"
 #include "Text.h"
 #include "ToolTip.h"
 
 using namespace Framework;
 
-// Contents of the Rahmen class from Rahmen.h
+// Contents of the Rahmen class from Border.h
 // Constructor
 Rahmen::Rahmen()
     : Zeichnung(),
@@ -92,7 +92,7 @@ int Rahmen::getLineLength() const
     return lineLength;
 }
 
-// Contents of the LRahmen class from Rahmen.h
+// Contents of the LRahmen class from Border.h
 // Constructor
 LRahmen::LRahmen()
     : Rahmen()
@@ -229,7 +229,7 @@ Zeichnung* LRahmen::dublizieren() const // Copies the drawing
     return obj;
 }
 
-// Contents of the Rahmen3D class from Rahmen.h
+// Contents of the Rahmen3D class from Border.h
 // Constructor
 Rahmen3D::Rahmen3D()
     : Rahmen()

Rahmen.h → Border.h

@@ -1,11 +1,11 @@
 #ifndef Rahmen_H
 #define Rahmen_H
 
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
-    class Bild; //! Bild.h
+    class Bild; //! Image.h
 
     class Rahmen : public Zeichnung
     {

Knopf.cpp → Button.cpp

@@ -1,21 +1,21 @@
-#include "Knopf.h"
+#include "Button.h"
 
-#include "AlphaFeld.h"
-#include "Bild.h"
-#include "Datei.h"
-#include "DateiSystem.h"
+#include "AlphaField.h"
+#include "Image.h"
+#include "File.h"
+#include "FileSystem.h"
 #include "Globals.h"
-#include "MausEreignis.h"
-#include "Rahmen.h"
-#include "Schrift.h"
+#include "MouseEvent.h"
+#include "Border.h"
+#include "Font.h"
 #include "Scroll.h"
-#include "TastaturEreignis.h"
+#include "KeyboardEvent.h"
 #include "Text.h"
 #include "ToolTip.h"
 
 using namespace Framework;
 
-// Contents of the Knopf class from Knopf.h
+// Contents of the Knopf class from Button.h
 // Constructor
 Knopf::Knopf()
     : TextFeld(),
@@ -257,7 +257,7 @@ Knopf::dublizieren() const // creates a copy of the drawing and returns it
     return obj;
 }
 
-// Contents of the KontrollKnopf class from Knopf.h
+// Contents of the KontrollKnopf class from Button.h
 // Constructor
 KontrollKnopf::KontrollKnopf()
     : ZeichnungHintergrund(),

Knopf.h → Button.h

@@ -1,16 +1,16 @@
 #ifndef Knopf_H
 #define Knopf_H
 
-#include "TextFeld.h"
+#include "TextField.h"
 
 namespace Framework
 {
-    class TextFeld;      //! TextFeld.h
-    class AlphaFeld;     //! AlphaFeld.h
+    class TextFeld;      //! TextField.h
+    class AlphaFeld;     //! AlphaField.h
     class Text;          //! Text.h
-    class Schrift;       //! Schrift.h
-    class Rahmen;        //! Rahmen.h
-    class LTDBDatei;     //! Dateisystem.h
+    class Schrift;       //! Font.h
+    class Rahmen;        //! Border.h
+    class LTDBDatei;     //! FileSystem.h
     class Knopf;         //! from this file
     class KontrollKnopf; //! from this file
     class TextRenderer;

Cache.h

@@ -1,7 +1,7 @@
-#pragma once
+#pragma once
 
 #include "HashMap.h"
-#include "Zeit.h"
+#include "Time.h"
 
 namespace Framework
 {

Kamera2D.cpp → Camera2D.cpp

@@ -1,8 +1,8 @@
-#include "Kamera2D.h"
+#include "Camera2D.h"
 
-#include "Bild.h"
+#include "Image.h"
 #include "Globals.h"
-#include "Welt2D.h"
+#include "World2D.h"
 
 using namespace Framework;
 

Kamera2D.h → Camera2D.h

@@ -1,8 +1,8 @@
-#pragma once
+#pragma once
 
 #include "Mat3.h"
-#include "Welt2D.h"
-#include "Zeichnung.h"
+#include "World2D.h"
+#include "Drawing.h"
 
 namespace Framework
 {

Kam3D.cpp → Camera3D.cpp

@@ -1,13 +1,13 @@
-#include "Kam3D.h"
+#include "Camera3D.h"
 
 #include <d3d11.h>
 #include <DirectXMath.h>
 
 #include "Globals.h"
-#include "MausEreignis.h"
+#include "MouseEvent.h"
 #include "Shader.h"
-#include "TastaturEreignis.h"
-#include "Welt3D.h"
+#include "KeyboardEvent.h"
+#include "World3D.h"
 
 using namespace Framework;
 

Kam3D.h → Camera3D.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Mat4.h"
-#include "Punkt.h"
-#include "Zeichnung3D.h"
+#include "Point.h"
+#include "Drawing3D.h"
 
 //! DirectX 11 Types
 
@@ -10,9 +10,9 @@ struct D3D11_VIEWPORT;
 
 namespace Framework
 {
-    struct MausEreignis; //! MausEreignis.h
+    struct MausEreignis; //! MouseEvent.h
     class Render3D;      //! Render3D.h
-    class Welt3D;        //! Welt3D.h
+    class Welt3D;        //! World3D.h
 
     struct ViewPort
     {

Klasse.h → Class.h

@@ -2,10 +2,10 @@
 
 #include <vector>
 
-#include "Feld.h"
-#include "Funktion.h"
+#include "Field.h"
+#include "Function.h"
 #include "Text.h"
-#include "Typ.h"
+#include "Type.h"
 
 namespace Framework
 {

Critical.h

@@ -2,7 +2,7 @@
 
 #include <condition_variable>
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 
 namespace Framework
 {

Cube.cpp

@@ -4,8 +4,8 @@
 #include "Globals.h"
 #include "GraphicsApi.h"
 #include "Model3DList.h"
-#include "Textur.h"
-#include "TexturList.h"
+#include "Texture.h"
+#include "TextureList.h"
 
 using namespace Framework;
 

DX11GraphicsApi.cpp

@@ -1,22 +1,22 @@
 #include <d3d11.h>
 #include <dxgi1_5.h>
 
-#include "Bild.h"
+#include "Image.h"
 #include "DLLRegister.h"
 #include "DXBuffer.h"
-#include "Fenster.h"
+#include "Window.h"
 #include "Globals.h"
 #include "GraphicsApi.h"
-#include "Kam3D.h"
+#include "Camera3D.h"
 #include "Logging.h"
 #include "Model3DList.h"
 #include "Shader.h"
-#include "Textur.h"
-#include "TexturList.h"
-#include "TexturModel.h"
+#include "Texture.h"
+#include "TextureList.h"
+#include "TextureModel.h"
 #include "UIPixelShader.h"
 #include "UIVertexShader.h"
-#include "Welt3D.h"
+#include "World3D.h"
 
 using namespace Framework;
 

DX12CommandQueue.cpp

@@ -1,9 +1,9 @@
-#include "DX12CommandQueue.h"
+#include "DX12CommandQueue.h"
 
 #include <d3d12.h>
 #include <iostream>
 
-#include "Fenster.h"
+#include "Window.h"
 #include "Logging.h"
 #include "Text.h"
 

DX12CommandQueue.h

@@ -1,6 +1,6 @@
-#pragma once
+#pragma once
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 #include "ReferenceCounter.h"
 
 //! DirectX12 Datentypen

DX12GraphicsApi.cpp

@@ -3,25 +3,25 @@
 #include <dxgi1_6.h>
 #include <dxgidebug.h>
 
-#include "Bild.h"
+#include "Image.h"
 #include "d3dx12.h"
 #include "DLLRegister.h"
 #include "DX12Buffer.h"
 #include "DX12CommandQueue.h"
 #include "DX12PixelShader.h"
 #include "DX12Shader.h"
-#include "DX12Textur.h"
+#include "DX12Texture.h"
 #include "DX12VertexShader.h"
-#include "Fenster.h"
+#include "Window.h"
 #include "Globals.h"
 #include "GraphicsApi.h"
-#include "Kam3D.h"
+#include "Camera3D.h"
 #include "Model3D.h"
 #include "Model3DList.h"
 #include "Shader.h"
-#include "TexturList.h"
-#include "TexturModel.h"
-#include "Welt3D.h"
+#include "TextureList.h"
+#include "TextureModel.h"
+#include "World3D.h"
 
 using namespace Framework;
 

DX12Textur.cpp → DX12Texture.cpp

@@ -1,6 +1,6 @@
-#include "DX12Textur.h"
+#include "DX12Texture.h"
 
-#include "Bild.h"
+#include "Image.h"
 #include "d3dx12.h"
 #include "DX12CommandQueue.h"
 

DX12Textur.h → DX12Texture.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Textur.h"
+#include "Texture.h"
 
 struct ID3D12Device;
 struct D3D12_RESOURCE_DESC;

DX9GraphicsApi.cpp

@@ -1,14 +1,14 @@
 #include <d3d9.h>
 
-#include "Bild.h"
+#include "Image.h"
 #include "DLLRegister.h"
-#include "Fenster.h"
+#include "Window.h"
 #include "Globals.h"
 #include "GraphicsApi.h"
-#include "Kam3D.h"
-#include "Textur.h"
-#include "Welt3D.h"
-#include "Zeit.h"
+#include "Camera3D.h"
+#include "Texture.h"
+#include "World3D.h"
+#include "Time.h"
 
 using namespace Framework;
 

DXBuffer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 #include "ReferenceCounter.h"
 
 #ifdef WIN32

Diagramm.cpp → Diagram.cpp

@@ -1,19 +1,19 @@
-#include "Diagramm.h"
+#include "Diagram.h"
 
 #include <math.h>
 
-#include "AlphaFeld.h"
-#include "Bild.h"
-#include "MausEreignis.h"
-#include "Rahmen.h"
-#include "Schrift.h"
+#include "AlphaField.h"
+#include "Image.h"
+#include "MouseEvent.h"
+#include "Border.h"
+#include "Font.h"
 #include "Scroll.h"
 #include "Text.h"
 #include "ToolTip.h"
 
 using namespace Framework;
 
-// Contents of the SLDiag class from Diagramm.h
+// Contents of the SLDiag class from Diagram.h
 // Constructor
 SLDiag::SLDiag()
     : ZeichnungHintergrund(),
@@ -308,7 +308,7 @@ int SLDiag::getLastValue(int lNum) const // returns the last value
     return lastValue->get(lNum);
 }
 
-// Contents of the DiagWert struct from Diagramm.h
+// Contents of the DiagWert struct from Diagram.h
 // Constructor
 DiagWert::DiagWert()
     : ReferenceCounter(),
@@ -331,7 +331,7 @@ DiagWert::~DiagWert()
     punkte->release();
 }
 
-// Contents of the DiagDaten struct from Diagramm.h
+// Contents of the DiagDaten struct from Diagram.h
 // Constructor
 DiagDaten::DiagDaten()
     : ReferenceCounter(),
@@ -365,7 +365,7 @@ DiagDaten::~DiagDaten()
     werte->release();
 }
 
-// Contents of the BaseDiag class from Diagramm.h
+// Contents of the BaseDiag class from Diagram.h
 // Constructor
 BaseDiag::BaseDiag(Critical* lock)
     : daten(new DiagDaten()),
@@ -1154,7 +1154,7 @@ bool BaseDiag::hatWertStyleNicht(int wNum, int style) const
         != daten->werte->z(wNum)->style;
 }
 
-// Contents of the LDiag class from Diagramm.h
+// Contents of the LDiag class from Diagram.h
 // Constructor
 LDiag::LDiag()
     : ZeichnungHintergrund(),

Diagramm.h → Diagram.h

@@ -3,14 +3,14 @@
 
 #include "Array.h"
 #include "Critical.h"
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
-    class Rahmen;     //! Rahmen.h
-    class AlphaFeld;  //! AlphaFeld.h
+    class Rahmen;     //! Border.h
+    class AlphaFeld;  //! AlphaField.h
     class Text;       //! Text.h
-    class Schrift;    //! Schrift.h
+    class Schrift;    //! Font.h
     class HScrollBar; //! Scroll.h
     class VScrollBar; //! Scroll.h
     class SLDiag;     //! from this file

Dialog.cpp

@@ -1,12 +1,12 @@
 #include "Dialog.h"
 
 #include "AsynchronCall.h"
-#include "AuswahlBox.h"
-#include "Bildschirm.h"
-#include "Fenster.h"
-#include "Knopf.h"
+#include "SelectionBox.h"
+#include "Screen.h"
+#include "Window.h"
+#include "Button.h"
 #include "RenderThread.h"
-#include "Schrift.h"
+#include "Font.h"
 #include "Text.h"
 
 using namespace Framework;

Zeichnung.cpp → Drawing.cpp

@@ -1,16 +1,16 @@
-#include "Zeichnung.h"
+#include "Drawing.h"
 
-#include "AlphaFeld.h"
-#include "Bild.h"
-#include "Bildschirm.h"
+#include "AlphaField.h"
+#include "Image.h"
+#include "Screen.h"
 #include "Globals.h"
-#include "MausEreignis.h"
-#include "Rahmen.h"
-#include "Schrift.h"
+#include "MouseEvent.h"
+#include "Border.h"
+#include "Font.h"
 #include "Scroll.h"
-#include "TastaturEreignis.h"
+#include "KeyboardEvent.h"
 #include "Text.h"
-#include "TextFeld.h"
+#include "TextField.h"
 #include "ToolTip.h"
 #include "UIInitialization.h"
 #ifdef WIN32
@@ -19,7 +19,7 @@
 
 using namespace Framework;
 
-// Contents of the Zeichnung class from Zeichnung.h
+// Contents of the Zeichnung class from Drawing.h
 // Constructor
 Zeichnung::Zeichnung()
     : ReferenceCounter(),
@@ -504,7 +504,7 @@ Zeichnung* Zeichnung::dublizieren() const // Creates a copy of the drawing
     return obj;
 }
 
-// Contents of the ZeichnungHintergrund class from Zeichnung.h
+// Contents of the ZeichnungHintergrund class from Drawing.h
 // Constructor
 ZeichnungHintergrund::ZeichnungHintergrund()
     : Zeichnung()

Zeichnung.h → Drawing.h

@@ -4,21 +4,21 @@
 #include <functional>
 
 #include "Critical.h"
-#include "MausEreignis.h"
-#include "Punkt.h"
+#include "MouseEvent.h"
+#include "Point.h"
 #include "ReferenceCounter.h"
-#include "TastaturEreignis.h"
+#include "KeyboardEvent.h"
 
 namespace Framework
 {
-    struct MausEreignis;     //! MausEreignis.h
-    struct TastaturEreignis; //! TastaturEreignis.h
-    class Bild;              //! Bild.h
+    struct MausEreignis;     //! MouseEvent.h
+    struct TastaturEreignis; //! KeyboardEvent.h
+    class Bild;              //! Image.h
     class Zeichnung;         //! From this file
     class ToolTip;           //! ToolTip.h
-    class Bildschirm;        //! Bildschirm.h
-    class Rahmen;            //! Rahmen.h
-    class AlphaFeld;         //! AlphaFeld.h
+    class Bildschirm;        //! Screen.h
+    class Rahmen;            //! Border.h
+    class AlphaFeld;         //! AlphaField.h
     class VScrollBar;        //! Scroll.h
     class HScrollBar;        //! Scroll.h
     class Schrift;
@@ -116,29 +116,29 @@ namespace Framework
         //! Sets the callback function to be called on a mouse event.
         //! If the callback returns 0, or was not set, the mouse event
         //! is not further processed by the drawing. The standard function
-        //! __ret1ME can be used, which is defined in MausEreignis.h and always
+        //! __ret1ME can be used, which is defined in MouseEvent.h and always
         //! returns 1 \param ak A pointer to the callback function
         DLLEXPORT void setMausEreignis(MausAktion ak);
         //! Adds a callback function to be called on a mouse event.
         //! If any callback returns 0, or none was set, the mouse event
         //! is not further processed by the drawing. The standard function
-        //! __ret1ME can be used, which is defined in MausEreignis.h and always
+        //! __ret1ME can be used, which is defined in MouseEvent.h and always
         //! returns 1 \param ak A pointer to the callback function
         DLLEXPORT void addMausEreignis(MausAktion ak);
         //! Sets the callback function to be called on a keyboard event.
         //! If the callback returns 0, or was not set, the keyboard event
         //! is not further processed by the drawing. The standard function
-        //! __ret1TE can be used, which is defined in TastaturEreignis.h and
+        //! __ret1TE can be used, which is defined in KeyboardEvent.h and
         //! always returns 1. Other standard functions are _nurNummernTE and
-        //! _nurHexTE also from TastaturEreignis.h \param ak A pointer to
+        //! _nurHexTE also from KeyboardEvent.h \param ak A pointer to
         //! the callback function
         DLLEXPORT void setTastaturEreignis(TastaturAktion ak);
         //! Adds a callback function to be called on a keyboard event.
         //! If any callback returns 0, or none was set, the keyboard event
         //! is not further processed by the drawing. The standard function
-        //! __ret1TE can be used, which is defined in TastaturEreignis.h and
+        //! __ret1TE can be used, which is defined in KeyboardEvent.h and
         //! always returns 1. Other standard functions are _nurNummernTE and
-        //! _nurHexTE also from TastaturEreignis.h \param ak A pointer to
+        //! _nurHexTE also from KeyboardEvent.h \param ak A pointer to
         //! the callback function
         DLLEXPORT void addTastaturEreignis(TastaturAktion ak);
         //! Sets the parameter passed to the callback function on a mouse event
@@ -153,16 +153,16 @@ namespace Framework
         //! the event has already been processed by the drawing. If the callback
         //! returns 1, or was not set, the mouse event will not be processed
         //! by any other drawing, such as ones behind this drawing. The standard
-        //! function __ret1ME can be used, which is defined in MausEreignis.h
+        //! function __ret1ME can be used, which is defined in MouseEvent.h
         //! and always returns 1 \param ak A pointer to the callback function
         DLLEXPORT void setNMausEreignis(MausAktion ak);
         //! Sets the callback function to be called on a keyboard event after
         //! the event has already been processed by the drawing. If the callback
         //! returns 1, or was not set, the keyboard event will not be processed
         //! by any other drawing. The standard function __ret1TE can be used,
-        //! which is defined in TastaturEreignis.h and always returns 1. Other
+        //! which is defined in KeyboardEvent.h and always returns 1. Other
         //! standard functions are _nurNummernTE and _nurHexTE also from
-        //! TastaturEreignis.h \param ak A pointer to the callback function
+        //! KeyboardEvent.h \param ak A pointer to the callback function
         DLLEXPORT void setNTastaturEreignis(TastaturAktion ak);
         //! Processes a mouse event. Called automatically by the framework.
         //! \param me The event

Zeichnung3D.cpp → Drawing3D.cpp

@@ -1,4 +1,4 @@
-#include "Zeichnung3D.h"
+#include "Drawing3D.h"
 
 using namespace Framework;
 

Either.h

@@ -1,8 +1,8 @@
-#pragma once
+#pragma once
 
 #include <functional>
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 
 namespace Framework
 {

Errors.h

@@ -1,6 +1,6 @@
-#pragma once
+#pragma once
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 
 namespace Framework
 {

Feld.h → Field.h

@@ -2,9 +2,9 @@
 
 #include <vector>
 
-#include "Sichtbarkeit.h"
+#include "Visibility.h"
 #include "Text.h"
-#include "Typ.h"
+#include "Type.h"
 
 namespace Framework
 {

Datei.cpp → File.cpp

@@ -1,8 +1,8 @@
-#include "Datei.h"
+#include "File.h"
 
 #include "Key.h"
 #include "Text.h"
-#include "Zeit.h"
+#include "Time.h"
 #ifdef WIN32
 #    include <direct.h>
 #    include <Shlwapi.h>
@@ -16,7 +16,7 @@
 using namespace Framework;
 using namespace Encryption;
 
-// Content of the Datei class from Datei.h
+// Content of the Datei class from File.h
 // Constructor
 Datei::Datei()
     : ReferenceCounter(),

Datei.h → File.h

@@ -10,7 +10,7 @@
 namespace Framework
 {
     class Text; //! Text.h
-    class Zeit; //! Zeit.h
+    class Zeit; //! Time.h
 
     namespace Encryption
     {

DateiDialog.cpp → FileDialog.cpp

@@ -1,4 +1,4 @@
-#include "DateiDialog.h"
+#include "FileDialog.h"
 
 #include <ShObjIdl.h>
 
@@ -14,7 +14,7 @@ void Framework::InitDialog()
 
 using namespace Framework;
 
-// Contents of the DateiDialog class from DateiDialog.h
+// Contents of the DateiDialog class from FileDialog.h
 // Constructor
 DateiDialog::DateiDialog()
     : ReferenceCounter()
@@ -188,7 +188,7 @@ Text* DateiDialog::anzeigen(bool open) const
     return 0;
 }
 
-// Contents of the DateiDialogTh class from DateiDialog.h
+// Contents of the DateiDialogTh class from FileDialog.h
 // Constructor
 DateiDialogTh::DateiDialogTh()
     : Thread()

DateiSystem.cpp → FileSystem.cpp

@@ -1,23 +1,23 @@
 //---Include---
-#include "DateiSystem.h"
+#include "FileSystem.h"
 
 #include <iostream>
 
-#include "Bild.h"
+#include "Image.h"
 #include "Text.h"
 #ifdef WIN32
-#    include "Fenster.h"
-#    include "Fortschritt.h"
+#    include "Window.h"
+#    include "Progress.h"
 #    include "Globals.h"
-#    include "Schrift.h"
+#    include "Font.h"
 #endif
-#include "Datei.h"
+#include "File.h"
 #include "Logging.h"
 
 using namespace Framework;
 
 // LTDB File format
-// Content of the LTDBPixel class from DateiSystem.h
+// Content of the LTDBPixel class from FileSystem.h
 // Constructor
 LTDBPixel::LTDBPixel(LTDBPixel* davor)
     : ReferenceCounter(),
@@ -507,7 +507,7 @@ unsigned char LTDBPixel::getA() const // returns alpha
     return A;
 }
 
-// Content of the LTDBDateiKopf class from Dateisystem.h
+// Content of the LTDBDateiKopf class from FileSystem.h
 // Constructor
 LTDBDateiKopf::LTDBDateiKopf()
     : ReferenceCounter(),
@@ -707,7 +707,7 @@ RCArray<Text>* LTDBDateiKopf::zBildListe() const
     return bilder;
 }
 
-// Content of the LTDBKopf class from DateiSystem.h
+// Content of the LTDBKopf class from FileSystem.h
 // Constructor
 LTDBKopf::LTDBKopf()
     : ReferenceCounter()
@@ -1033,7 +1033,7 @@ int ende) const // returns the bits from begin to ende (excluding ende)
     return ret;
 }
 
-// Content of the LTDBBody class from Dateisystem.h
+// Content of the LTDBBody class from FileSystem.h
 // Constructor
 LTDBBody::LTDBBody()
     : ReferenceCounter(),
@@ -1191,7 +1191,7 @@ const Punkt& LTDBBody::getSize() const // returns the size of the image
     return gr;
 }
 
-// Content of the LTDBDatei class from Dateisystem.h
+// Content of the LTDBDatei class from FileSystem.h
 // Constructor
 LTDBDatei::LTDBDatei()
     : ReferenceCounter(),
@@ -1512,7 +1512,7 @@ bool LTDBDatei::istOffen() const // Checks if the file is open
 }
 #ifdef WIN32
 // LTDS File format
-// Content of the LTDSPixel class from DateiSystem.h
+// Content of the LTDSPixel class from FileSystem.h
 // Constructor
 LTDSPixel::LTDSPixel(LTDSPixel* davor)
     : ReferenceCounter(),
@@ -1793,7 +1793,7 @@ unsigned char LTDSPixel::getA() const // returns alpha
     return alpha;
 }
 
-// Content of the LTDSDateiKopf class from Dateisystem.h
+// Content of the LTDSDateiKopf class from FileSystem.h
 // Constructor
 LTDSDateiKopf::LTDSDateiKopf()
     : ReferenceCounter(),
@@ -1915,7 +1915,7 @@ const // returns the number of stored font sizes
     return sganzahl;
 }
 
-// Content of the LTDSSchriftKopf class from Dateisystem.h
+// Content of the LTDSSchriftKopf class from FileSystem.h
 // Constructor
 LTDSSchriftKopf::LTDSSchriftKopf()
     : ReferenceCounter(),
@@ -2080,7 +2080,7 @@ unsigned char* LTDSSchriftKopf::getZeichen() const // returns the characters
     return zeichen;
 }
 
-// Content of the LTDSBuchstabenKopf class from Dateisystem.h
+// Content of the LTDSBuchstabenKopf class from FileSystem.h
 // Constructor
 LTDSBuchstabenKopf::LTDSBuchstabenKopf()
     : ReferenceCounter(),
@@ -2144,7 +2144,7 @@ const Punkt& LTDSBuchstabenKopf::getGroesse() const // returns the size
     return size;
 }
 
-// Content of the LTDSBuchstabenKoerper class from Dateisystem.h
+// Content of the LTDSBuchstabenKoerper class from FileSystem.h
 // Constructor
 LTDSBuchstabenKoerper::LTDSBuchstabenKoerper(LTDSBuchstabenKopf* kopf)
     : ReferenceCounter(),
@@ -2265,7 +2265,7 @@ LTDSBuchstabenKoerper::getZeichen() const // returns the character
     return zeichen;
 }
 
-// Content of the LTDSDatei class from Dateisystem.h
+// Content of the LTDSDatei class from FileSystem.h
 // Constructor
 LTDSDatei::LTDSDatei()
     : ReferenceCounter(),

DateiSystem.h → FileSystem.h

@@ -4,17 +4,17 @@
 #include <fstream>
 
 #include "Array.h"
-#include "Punkt.h"
+#include "Point.h"
 
 namespace Framework
 {
-    class Bild;    //! Bild.h
+    class Bild;    //! Image.h
     class Text;    //! Text.h
-    class FBalken; //! Fortschritt.h
+    class FBalken; //! Progress.h
 #ifdef WIN32
-    class Buchstabe; //! Schrift.h
-    class Alphabet;  //! Schrift.h
-    class Schrift;   //! Schrift.h
+    class Buchstabe; //! Font.h
+    class Alphabet;  //! Font.h
+    class Schrift;   //! Font.h
 #endif
     class LTDBPixel; //! from this file
     class LTDBKopf;  //! from this file

Schrift.cpp → Font.cpp

@@ -1,6 +1,6 @@
-#include "Schrift.h"
+#include "Font.h"
 
-#include "Bild.h"
+#include "Image.h"
 #include "Globals.h"
 #include "Scroll.h"
 #include "Text.h"
@@ -11,7 +11,7 @@
 
 using namespace Framework;
 
-// Contents of the Buchstabe class from Schrift.h
+// Contents of the Buchstabe class from Font.h
 // Constructor
 Buchstabe::Buchstabe()
     : ReferenceCounter(),
@@ -82,7 +82,7 @@ unsigned char* Buchstabe::getBuff() const // returns the alpha buffer
     return alpha;
 }
 
-// Contents of the Alphabet class from Schrift.h
+// Contents of the Alphabet class from Font.h
 // Constructor
 Alphabet::Alphabet()
     : ReferenceCounter(),
@@ -157,7 +157,7 @@ int Alphabet::getSchriftSize() const // returns the font size
     return schriftSize;
 }
 
-// Contents of the AlphabetArray class from Schrift.h
+// Contents of the AlphabetArray class from Font.h
 // Constructor
 AlphabetArray::AlphabetArray()
 {
@@ -201,7 +201,7 @@ Alphabet* AlphabetArray::zAlphabet(
     return alphabets[sg];
 }
 
-// Contents of the Schrift class from Schrift.h
+// Contents of the Schrift class from Font.h
 // Constructor
 Schrift::Schrift()
     : ReferenceCounter(),

Schrift.h → Font.h

@@ -4,12 +4,12 @@
 #include <functional>
 
 #include "Critical.h"
-#include "Punkt.h"
+#include "Point.h"
 #include "ReferenceCounter.h"
 
 namespace Framework
 {
-    class Bild;      //! Bild.h
+    class Bild;      //! Image.h
     class Text;      //! Text.h
     class Buchstabe; //! from this file
     class Alphabet;  //! from this file

Framework Linux.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
@@ -109,49 +109,49 @@
     <TargetExt>.so</TargetExt>
   </PropertyGroup>
   <ItemGroup>
-    <ClCompile Include="AlphaFeld.cpp" />
+    <ClCompile Include="AlphaField.cpp" />
     <ClCompile Include="Animation.cpp" />
     <ClCompile Include="Animation3D.cpp" />
     <ClCompile Include="AsynchronCall.cpp" />
-    <ClCompile Include="AuswahlBox.cpp" />
+    <ClCompile Include="SelectionBox.cpp" />
     <ClCompile Include="Base64.cpp" />
-    <ClCompile Include="Bild.cpp" />
-    <ClCompile Include="Bildschirm.cpp" />
+    <ClCompile Include="Image.cpp" />
+    <ClCompile Include="Screen.cpp" />
     <ClCompile Include="Console.cpp" />
     <ClCompile Include="Critical.cpp" />
     <ClCompile Include="Cube.cpp" />
-    <ClCompile Include="Datei.cpp" />
-    <ClCompile Include="DateiSystem.cpp" />
-    <ClCompile Include="Diagramm.cpp" />
+    <ClCompile Include="File.cpp" />
+    <ClCompile Include="FileSystem.cpp" />
+    <ClCompile Include="Diagram.cpp" />
     <ClCompile Include="DLLRegister.cpp" />
     <ClCompile Include="DXBuffer.cpp" />
     <ClCompile Include="Errors.cpp" />
-    <ClCompile Include="Fenster.cpp" />
-    <ClCompile Include="Fortschritt.cpp" />
+    <ClCompile Include="Window.cpp" />
+    <ClCompile Include="Progress.cpp" />
     <ClCompile Include="Global.cpp" />
     <ClCompile Include="GraphicsApi.cpp" />
-    <ClCompile Include="InitDatei.cpp" />
+    <ClCompile Include="InitFile.cpp" />
     <ClCompile Include="InMemoryBuffer.cpp" />
     <ClCompile Include="JSON.cpp" />
     <ClCompile Include="JsonEditor.cpp" />
-    <ClCompile Include="Kamera2D.cpp" />
+    <ClCompile Include="Camera2D.cpp" />
     <ClCompile Include="Key.cpp" />
-    <ClCompile Include="Knopf.cpp" />
-    <ClCompile Include="KSGTDatei.cpp" />
-    <ClCompile Include="Liste.cpp" />
+    <ClCompile Include="Button.cpp" />
+    <ClCompile Include="KSGTFile.cpp" />
+    <ClCompile Include="List.cpp" />
     <ClCompile Include="Logging.cpp" />
-    <ClCompile Include="M2Datei.cpp" />
-    <ClCompile Include="M2DVorschau.cpp" />
-    <ClCompile Include="M3Datei.cpp" />
-    <ClCompile Include="MausEreignis.cpp" />
+    <ClCompile Include="M2File.cpp" />
+    <ClCompile Include="M2DPreview.cpp" />
+    <ClCompile Include="M3File.cpp" />
+    <ClCompile Include="MouseEvent.cpp" />
     <ClCompile Include="Model2D.cpp" />
     <ClCompile Include="Model3D.cpp" />
     <ClCompile Include="Model3DCollection.cpp" />
     <ClCompile Include="Model3DList.cpp" />
     <ClCompile Include="ObjFile.cpp" />
-    <ClCompile Include="Prozess.cpp" />
-    <ClCompile Include="Punkt.cpp" />
-    <ClCompile Include="Rahmen.cpp" />
+    <ClCompile Include="Process.cpp" />
+    <ClCompile Include="Point.cpp" />
+    <ClCompile Include="Border.cpp" />
     <ClCompile Include="Random.cpp" />
     <ClInclude Include="Console.h" />
     <ClInclude Include="Iterator.h" />
@@ -161,73 +161,73 @@
     <ClCompile Include="Reader.cpp" />
     <ClCompile Include="ReferenceCounter.cpp" />
     <ClCompile Include="Regex.cpp" />
-    <ClCompile Include="Schrift.cpp" />
+    <ClCompile Include="Font.cpp" />
     <ClCompile Include="Scroll.cpp" />
-    <ClCompile Include="Tabelle.cpp" />
-    <ClCompile Include="TastaturEreignis.cpp" />
+    <ClCompile Include="Table.cpp" />
+    <ClCompile Include="KeyboardEvent.cpp" />
     <ClCompile Include="Text.cpp" />
-    <ClCompile Include="TextFeld.cpp" />
-    <ClCompile Include="Textur.cpp" />
-    <ClCompile Include="Textur2D.cpp" />
-    <ClCompile Include="TexturList.cpp" />
-    <ClCompile Include="TexturModel.cpp" />
+    <ClCompile Include="TextField.cpp" />
+    <ClCompile Include="Texture.cpp" />
+    <ClCompile Include="Texture2D.cpp" />
+    <ClCompile Include="TextureList.cpp" />
+    <ClCompile Include="TextureModel.cpp" />
     <ClCompile Include="Thread.cpp" />
     <ClCompile Include="ToolTip.cpp" />
     <ClCompile Include="UIInitialization.cpp" />
     <ClCompile Include="UIMLView.cpp" />
-    <ClCompile Include="Welt2D.cpp" />
-    <ClCompile Include="Welt3D.cpp" />
+    <ClCompile Include="World2D.cpp" />
+    <ClCompile Include="World3D.cpp" />
     <ClCompile Include="Writer.cpp" />
     <ClCompile Include="XML.cpp" />
-    <ClCompile Include="Zeichnung.cpp" />
-    <ClCompile Include="Zeichnung3D.cpp" />
-    <ClCompile Include="Zeit.cpp" />
+    <ClCompile Include="Drawing.cpp" />
+    <ClCompile Include="Drawing3D.cpp" />
+    <ClCompile Include="Time.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="AlphaFeld.h" />
+    <ClInclude Include="AlphaField.h" />
     <ClInclude Include="Animation.h" />
     <ClInclude Include="Animation3D.h" />
     <ClInclude Include="Array.h" />
     <ClInclude Include="AsynchronCall.h" />
-    <ClInclude Include="AuswahlBox.h" />
+    <ClInclude Include="SelectionBox.h" />
     <ClInclude Include="Base64.h" />
-    <ClInclude Include="Betriebssystem.h" />
-    <ClInclude Include="Bild.h" />
-    <ClInclude Include="Bildschirm.h" />
+    <ClInclude Include="OperatingSystem.h" />
+    <ClInclude Include="Image.h" />
+    <ClInclude Include="Screen.h" />
     <ClInclude Include="Cache.h" />
     <ClInclude Include="CharMap.h" />
     <ClInclude Include="Critical.h" />
     <ClInclude Include="Cube.h" />
-    <ClInclude Include="Datei.h" />
-    <ClInclude Include="DateiSystem.h" />
-    <ClInclude Include="Diagramm.h" />
+    <ClInclude Include="File.h" />
+    <ClInclude Include="FileSystem.h" />
+    <ClInclude Include="Diagram.h" />
     <ClInclude Include="DLLRegister.h" />
-    <ClInclude Include="DreieckListe.h" />
+    <ClInclude Include="TriangleList.h" />
     <ClInclude Include="DXBuffer.h" />
-    <ClInclude Include="Ebene3D.h" />
+    <ClInclude Include="Plane3D.h" />
     <ClInclude Include="Either.h" />
     <ClInclude Include="Errors.h" />
-    <ClInclude Include="Fenster.h" />
-    <ClInclude Include="Fortschritt.h" />
+    <ClInclude Include="Window.h" />
+    <ClInclude Include="Progress.h" />
     <ClInclude Include="FrameworkMath.h" />
     <ClInclude Include="Globals.h" />
     <ClInclude Include="GraphicsApi.h" />
     <ClInclude Include="HashMap.h" />
     <ClInclude Include="ImmutablePair.h" />
-    <ClInclude Include="InitDatei.h" />
+    <ClInclude Include="InitFile.h" />
     <ClInclude Include="InMemoryBuffer.h" />
     <ClInclude Include="JSON.h" />
-    <ClInclude Include="Kamera2D.h" />
+    <ClInclude Include="Camera2D.h" />
     <ClInclude Include="Key.h" />
-    <ClInclude Include="Knopf.h" />
-    <ClInclude Include="KSGTDatei.h" />
-    <ClInclude Include="Liste.h" />
-    <ClInclude Include="M2Datei.h" />
-    <ClInclude Include="M2DVorschau.h" />
-    <ClInclude Include="M3Datei.h" />
+    <ClInclude Include="Button.h" />
+    <ClInclude Include="KSGTFile.h" />
+    <ClInclude Include="List.h" />
+    <ClInclude Include="M2File.h" />
+    <ClInclude Include="M2DPreview.h" />
+    <ClInclude Include="M3File.h" />
     <ClInclude Include="Mat3.h" />
     <ClInclude Include="Mat4.h" />
-    <ClInclude Include="MausEreignis.h" />
+    <ClInclude Include="MouseEvent.h" />
     <ClInclude Include="Maybe.h" />
     <ClInclude Include="Model2D.h" />
     <ClInclude Include="Model3D.h" />
@@ -235,26 +235,26 @@
     <ClInclude Include="Model3DList.h" />
     <ClInclude Include="ObjFile.h" />
     <ClInclude Include="Pair.h" />
-    <ClInclude Include="Prozess.h" />
-    <ClInclude Include="Punkt.h" />
-    <ClInclude Include="Rahmen.h" />
+    <ClInclude Include="Process.h" />
+    <ClInclude Include="Point.h" />
+    <ClInclude Include="Border.h" />
     <ClInclude Include="Random.h" />
     <ClInclude Include="Reader.h" />
     <ClInclude Include="Rect2.h" />
     <ClInclude Include="ReferenceCounter.h" />
     <ClInclude Include="Regex.h" />
-    <ClInclude Include="Schrift.h" />
+    <ClInclude Include="Font.h" />
     <ClInclude Include="Scroll.h" />
     <ClInclude Include="Stream.h" />
     <ClInclude Include="Supplier.h" />
-    <ClInclude Include="Tabelle.h" />
-    <ClInclude Include="TastaturEreignis.h" />
+    <ClInclude Include="Table.h" />
+    <ClInclude Include="KeyboardEvent.h" />
     <ClInclude Include="Text.h" />
-    <ClInclude Include="TextFeld.h" />
-    <ClInclude Include="Textur.h" />
-    <ClInclude Include="Textur2D.h" />
-    <ClInclude Include="TexturList.h" />
-    <ClInclude Include="TexturModel.h" />
+    <ClInclude Include="TextField.h" />
+    <ClInclude Include="Texture.h" />
+    <ClInclude Include="Texture2D.h" />
+    <ClInclude Include="TextureList.h" />
+    <ClInclude Include="TextureModel.h" />
     <ClInclude Include="Thread.h" />
     <ClInclude Include="ToolTip.h" />
     <ClInclude Include="Tree.h" />
@@ -264,13 +264,13 @@
     <ClInclude Include="Vec2.h" />
     <ClInclude Include="Vec3.h" />
     <ClInclude Include="VecN.h" />
-    <ClInclude Include="Welt2D.h" />
-    <ClInclude Include="Welt3D.h" />
+    <ClInclude Include="World2D.h" />
+    <ClInclude Include="World3D.h" />
     <ClInclude Include="Writer.h" />
     <ClInclude Include="XML.h" />
-    <ClInclude Include="Zeichnung.h" />
-    <ClInclude Include="Zeichnung3D.h" />
-    <ClInclude Include="Zeit.h" />
+    <ClInclude Include="Drawing.h" />
+    <ClInclude Include="Drawing3D.h" />
+    <ClInclude Include="Time.h" />
   </ItemGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>

Framework Linux.vcxproj.filters

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Ressourcendateien">
+    <Filter Include="Resources">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
@@ -11,28 +11,28 @@
     <Filter Include="Framework\OS">
       <UniqueIdentifier>{446e41c7-ea7d-4519-9cd1-1238232b08f8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\OS\Datei">
+    <Filter Include="Framework\OS\File">
       <UniqueIdentifier>{fbd720d3-b19c-4501-b4dd-600cdbbea72d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik">
+    <Filter Include="Framework\Graphics">
       <UniqueIdentifier>{d87f71ae-4946-4766-a9e3-e93f41e7f079}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik\3D">
+    <Filter Include="Framework\Graphics\3D">
       <UniqueIdentifier>{c3d8b482-b58f-48c6-9945-797f38a60fcf}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik\2D">
+    <Filter Include="Framework\Graphics\2D">
       <UniqueIdentifier>{98ccc730-0ee3-4075-bfba-8998571c99e5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik\DX">
+    <Filter Include="Framework\Graphics\DX">
       <UniqueIdentifier>{cbb56eda-8286-4f8b-9a06-47b5af838106}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik\4D">
+    <Filter Include="Framework\Graphics\4D">
       <UniqueIdentifier>{638c4ef2-2ea4-4d4f-872a-f2012f97a696}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Objekte3D">
+    <Filter Include="Framework\Objects3D">
       <UniqueIdentifier>{28760380-5f68-43aa-87ae-353d20cad63d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Objekte2D">
+    <Filter Include="Framework\Objects2D">
       <UniqueIdentifier>{c85aabf4-2e43-4a74-90bc-2d92b7bf3259}</UniqueIdentifier>
     </Filter>
     <Filter Include="Framework\Data">
@@ -56,81 +56,81 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Model2D.h">
-      <Filter>Framework\Grafik\2D</Filter>
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
     <ClInclude Include="Vec2.h">
-      <Filter>Framework\Grafik\2D</Filter>
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
     <ClInclude Include="Vec3.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
     <ClInclude Include="Mat3.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
-    <ClInclude Include="AlphaFeld.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="AlphaField.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Knopf.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Button.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Fenster.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Window.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Fortschritt.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Progress.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Liste.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="List.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Diagramm.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Diagram.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Rahmen.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Border.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Tabelle.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Table.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="TextFeld.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="TextField.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
     <ClInclude Include="ToolTip.h">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
     <ClInclude Include="Scroll.h">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Bildschirm.h">
-      <Filter>Framework\Grafik\DX</Filter>
+    <ClInclude Include="Screen.h">
+      <Filter>Framework\Graphics\DX</Filter>
     </ClInclude>
-    <ClInclude Include="Betriebssystem.h">
+    <ClInclude Include="OperatingSystem.h">
       <Filter>Framework\OS</Filter>
     </ClInclude>
-    <ClInclude Include="AuswahlBox.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="SelectionBox.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Prozess.h">
+    <ClInclude Include="Process.h">
       <Filter>Framework\OS</Filter>
     </ClInclude>
     <ClInclude Include="Thread.h">
       <Filter>Framework\OS</Filter>
     </ClInclude>
-    <ClInclude Include="Bild.h">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClInclude Include="Image.h">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
-    <ClInclude Include="MausEreignis.h">
+    <ClInclude Include="MouseEvent.h">
       <Filter>Framework</Filter>
     </ClInclude>
-    <ClInclude Include="TastaturEreignis.h">
+    <ClInclude Include="KeyboardEvent.h">
       <Filter>Framework</Filter>
     </ClInclude>
-    <ClInclude Include="Schrift.h">
+    <ClInclude Include="Font.h">
       <Filter>Framework</Filter>
     </ClInclude>
     <ClInclude Include="Text.h">
       <Filter>Framework</Filter>
     </ClInclude>
-    <ClInclude Include="Punkt.h">
+    <ClInclude Include="Point.h">
       <Filter>Framework</Filter>
     </ClInclude>
     <ClInclude Include="Globals.h">
@@ -139,77 +139,77 @@
     <ClInclude Include="FrameworkMath.h">
       <Filter>Framework</Filter>
     </ClInclude>
-    <ClInclude Include="Zeit.h">
+    <ClInclude Include="Time.h">
       <Filter>Framework</Filter>
     </ClInclude>
-    <ClInclude Include="Datei.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="File.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
-    <ClInclude Include="DateiSystem.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="FileSystem.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
-    <ClInclude Include="InitDatei.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="InitFile.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
-    <ClInclude Include="KSGTDatei.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="KSGTFile.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
-    <ClInclude Include="M2Datei.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="M2File.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
-    <ClInclude Include="M2DVorschau.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="M2DPreview.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Zeichnung.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Drawing.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="M3Datei.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="M3File.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
     <ClInclude Include="Model3D.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
-    <ClInclude Include="Zeichnung3D.h">
-      <Filter>Framework\Objekte3D</Filter>
+    <ClInclude Include="Drawing3D.h">
+      <Filter>Framework\Objects3D</Filter>
     </ClInclude>
     <ClInclude Include="Mat4.h">
-      <Filter>Framework\Grafik\4D</Filter>
+      <Filter>Framework\Graphics\4D</Filter>
     </ClInclude>
-    <ClInclude Include="DreieckListe.h">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClInclude Include="TriangleList.h">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
-    <ClInclude Include="Welt3D.h">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClInclude Include="World3D.h">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
-    <ClInclude Include="Textur.h">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClInclude Include="Texture.h">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
     <ClInclude Include="Cube.h">
-      <Filter>Framework\Objekte3D</Filter>
+      <Filter>Framework\Objects3D</Filter>
     </ClInclude>
     <ClInclude Include="Model3DList.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
-    <ClInclude Include="TexturList.h">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClInclude Include="TextureList.h">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
     <ClInclude Include="Animation3D.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
-    <ClInclude Include="TexturModel.h">
-      <Filter>Framework\Objekte3D</Filter>
+    <ClInclude Include="TextureModel.h">
+      <Filter>Framework\Objects3D</Filter>
     </ClInclude>
     <ClInclude Include="Animation.h">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Ebene3D.h">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClInclude Include="Plane3D.h">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
     <ClInclude Include="Key.h">
       <Filter>Framework</Filter>
     </ClInclude>
     <ClInclude Include="DXBuffer.h">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClInclude>
     <ClInclude Include="Critical.h">
       <Filter>Framework\OS</Filter>
@@ -220,17 +220,17 @@
     <ClInclude Include="AsynchronCall.h">
       <Filter>Framework\OS</Filter>
     </ClInclude>
-    <ClInclude Include="Textur2D.h">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClInclude Include="Texture2D.h">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
-    <ClInclude Include="Welt2D.h">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClInclude Include="World2D.h">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
-    <ClInclude Include="Kamera2D.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Camera2D.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
     <ClInclude Include="Rect2.h">
-      <Filter>Framework\Grafik\2D</Filter>
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
     <ClInclude Include="Array.h">
       <Filter>Framework\Data</Filter>
@@ -251,13 +251,13 @@
       <Filter>Framework</Filter>
     </ClInclude>
     <ClInclude Include="UIMLView.h">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
     <ClInclude Include="DLLRegister.h">
       <Filter>Framework\OS</Filter>
     </ClInclude>
     <ClInclude Include="GraphicsApi.h">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClInclude>
     <ClInclude Include="ReferenceCounter.h">
       <Filter>Framework</Filter>
@@ -287,16 +287,16 @@
       <Filter>Framework\Data</Filter>
     </ClInclude>
     <ClInclude Include="Model3DCollection.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
     <ClInclude Include="ImmutablePair.h">
       <Filter>Framework\Data</Filter>
     </ClInclude>
     <ClInclude Include="VecN.h">
-      <Filter>Framework\Grafik</Filter>
+      <Filter>Framework\Graphics</Filter>
     </ClInclude>
     <ClInclude Include="ObjFile.h">
-      <Filter>Framework\OS\Datei</Filter>
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
     <ClInclude Include="Base64.h">
       <Filter>Framework</Filter>
@@ -333,128 +333,128 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Bild.cpp">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClCompile Include="Image.cpp">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClCompile>
     <ClCompile Include="Model2D.cpp">
-      <Filter>Framework\Grafik\2D</Filter>
+      <Filter>Framework\Graphics\2D</Filter>
     </ClCompile>
-    <ClCompile Include="Textur2D.cpp">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClCompile Include="Texture2D.cpp">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClCompile>
-    <ClCompile Include="Welt2D.cpp">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClCompile Include="World2D.cpp">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClCompile>
     <ClCompile Include="Animation3D.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
     <ClCompile Include="Model3D.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
     <ClCompile Include="Model3DList.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
-    <ClCompile Include="Textur.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClCompile Include="Texture.cpp">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
-    <ClCompile Include="TexturList.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClCompile Include="TextureList.cpp">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
-    <ClCompile Include="Welt3D.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClCompile Include="World3D.cpp">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
-    <ClCompile Include="Bildschirm.cpp">
-      <Filter>Framework\Grafik\DX</Filter>
+    <ClCompile Include="Screen.cpp">
+      <Filter>Framework\Graphics\DX</Filter>
     </ClCompile>
     <ClCompile Include="DXBuffer.cpp">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClCompile>
     <ClCompile Include="GraphicsApi.cpp">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClCompile>
     <ClCompile Include="InMemoryBuffer.cpp">
       <Filter>Framework\IO</Filter>
     </ClCompile>
-    <ClCompile Include="AlphaFeld.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="AlphaField.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="Animation.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="AuswahlBox.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="SelectionBox.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Diagramm.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Diagram.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Fenster.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Window.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Fortschritt.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Progress.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Kamera2D.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Camera2D.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Knopf.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Button.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Liste.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="List.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="M2DVorschau.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="M2DPreview.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Rahmen.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Border.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="Scroll.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Tabelle.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Table.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="TextFeld.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="TextField.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="ToolTip.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="UIMLView.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Zeichnung.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Drawing.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="Cube.cpp">
-      <Filter>Framework\Objekte3D</Filter>
+      <Filter>Framework\Objects3D</Filter>
     </ClCompile>
-    <ClCompile Include="TexturModel.cpp">
-      <Filter>Framework\Objekte3D</Filter>
+    <ClCompile Include="TextureModel.cpp">
+      <Filter>Framework\Objects3D</Filter>
     </ClCompile>
-    <ClCompile Include="Zeichnung3D.cpp">
-      <Filter>Framework\Objekte3D</Filter>
+    <ClCompile Include="Drawing3D.cpp">
+      <Filter>Framework\Objects3D</Filter>
     </ClCompile>
-    <ClCompile Include="Datei.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="File.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
-    <ClCompile Include="DateiSystem.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="FileSystem.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
-    <ClCompile Include="InitDatei.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="InitFile.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
-    <ClCompile Include="KSGTDatei.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="KSGTFile.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
-    <ClCompile Include="M2Datei.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="M2File.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
-    <ClCompile Include="M3Datei.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="M3File.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
     <ClCompile Include="ObjFile.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
     <ClCompile Include="AsynchronCall.cpp">
       <Filter>Framework\OS</Filter>
@@ -465,7 +465,7 @@
     <ClCompile Include="DLLRegister.cpp">
       <Filter>Framework\OS</Filter>
     </ClCompile>
-    <ClCompile Include="Prozess.cpp">
+    <ClCompile Include="Process.cpp">
       <Filter>Framework\OS</Filter>
     </ClCompile>
     <ClCompile Include="Thread.cpp">
@@ -483,10 +483,10 @@
     <ClCompile Include="Key.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
-    <ClCompile Include="MausEreignis.cpp">
+    <ClCompile Include="MouseEvent.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
-    <ClCompile Include="Punkt.cpp">
+    <ClCompile Include="Point.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
     <ClCompile Include="Random.cpp">
@@ -495,10 +495,10 @@
     <ClCompile Include="ReferenceCounter.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
-    <ClCompile Include="Schrift.cpp">
+    <ClCompile Include="Font.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
-    <ClCompile Include="TastaturEreignis.cpp">
+    <ClCompile Include="KeyboardEvent.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
     <ClCompile Include="Text.cpp">
@@ -507,11 +507,11 @@
     <ClCompile Include="UIInitialization.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
-    <ClCompile Include="Zeit.cpp">
+    <ClCompile Include="Time.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
     <ClCompile Include="Model3DCollection.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
     <ClCompile Include="Regex.cpp">
       <Filter>Framework\Regex</Filter>

Framework.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -199,13 +199,13 @@ copy "x64\Release\Framework.dll" "..\..\Spiele Platform\SMP\Fertig\x64\framework
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="AbstractElement.h" />
-    <ClInclude Include="AlphaFeld.h" />
+    <ClInclude Include="AlphaField.h" />
     <ClInclude Include="Animation.h" />
     <ClInclude Include="Animation3D.h" />
     <ClInclude Include="Array.h" />
     <ClInclude Include="Assembly.h" />
     <ClInclude Include="AsynchronCall.h" />
-    <ClInclude Include="AuswahlBox.h" />
+    <ClInclude Include="SelectionBox.h" />
     <ClInclude Include="Console.h" />
     <ClInclude Include="DataValidator.h" />
     <ClInclude Include="Iterator.h" />
@@ -213,8 +213,8 @@ copy "x64\Release\Framework.dll" "..\..\Spiele Platform\SMP\Fertig\x64\framework
     <ClInclude Include="Logging.h" />
     <ClInclude Include="Regex.h" />
     <ClInclude Include="Base64.h" />
-    <ClInclude Include="Bild.h" />
-    <ClInclude Include="Bildschirm.h" />
+    <ClInclude Include="Image.h" />
+    <ClInclude Include="Screen.h" />
     <ClInclude Include="Cache.h" />
     <ClInclude Include="CharMap.h" />
     <ClInclude Include="d3dx12.h" />
@@ -225,37 +225,37 @@ copy "x64\Release\Framework.dll" "..\..\Spiele Platform\SMP\Fertig\x64\framework
     <ClInclude Include="Dialog.h" />
     <ClInclude Include="DLLRegister.h" />
     <ClInclude Include="DX12Shader.h" />
-    <ClInclude Include="DX12Textur.h" />
+    <ClInclude Include="DX12Texture.h" />
     <ClInclude Include="Either.h" />
     <ClInclude Include="Errors.h" />
     <ClInclude Include="GraphicsApi.h" />
     <ClInclude Include="DXBuffer.h" />
-    <ClInclude Include="Datei.h" />
-    <ClInclude Include="DateiDialog.h" />
-    <ClInclude Include="DateiSystem.h" />
-    <ClInclude Include="Diagramm.h" />
-    <ClInclude Include="DreieckListe.h" />
-    <ClInclude Include="Fenster.h" />
-    <ClInclude Include="Fortschritt.h" />
+    <ClInclude Include="File.h" />
+    <ClInclude Include="FileDialog.h" />
+    <ClInclude Include="FileSystem.h" />
+    <ClInclude Include="Diagram.h" />
+    <ClInclude Include="TriangleList.h" />
+    <ClInclude Include="Window.h" />
+    <ClInclude Include="Progress.h" />
     <ClInclude Include="FrameworkMath.h" />
     <ClInclude Include="Globals.h" />
     <ClInclude Include="HashMap.h" />
     <ClInclude Include="ImmutablePair.h" />
-    <ClInclude Include="InitDatei.h" />
+    <ClInclude Include="InitFile.h" />
     <ClInclude Include="InMemoryBuffer.h" />
     <ClInclude Include="JSON.h" />
-    <ClInclude Include="Kam3D.h" />
-    <ClInclude Include="Kamera2D.h" />
-    <ClInclude Include="Knopf.h" />
-    <ClInclude Include="KSGTDatei.h" />
-    <ClInclude Include="Liste.h" />
-    <ClInclude Include="M2Datei.h" />
-    <ClInclude Include="M3Datei.h" />
+    <ClInclude Include="Camera3D.h" />
+    <ClInclude Include="Camera2D.h" />
+    <ClInclude Include="Button.h" />
+    <ClInclude Include="KSGTFile.h" />
+    <ClInclude Include="List.h" />
+    <ClInclude Include="M2File.h" />
+    <ClInclude Include="M3File.h" />
     <ClInclude Include="main.h" />
     <ClInclude Include="Mat3.h" />
     <ClInclude Include="Mat4.h" />
-    <ClInclude Include="Maus.h" />
-    <ClInclude Include="MausEreignis.h" />
+    <ClInclude Include="Mouse.h" />
+    <ClInclude Include="MouseEvent.h" />
     <ClInclude Include="Maybe.h" />
     <ClInclude Include="ObjFile.h" />
     <ClInclude Include="RCPointer.h" />
@@ -265,7 +265,7 @@ copy "x64\Release\Framework.dll" "..\..\Spiele Platform\SMP\Fertig\x64\framework
     <ClInclude Include="Stream.h" />
     <ClInclude Include="UIDialog.h" />
     <ClInclude Include="Model2D.h" />
-    <ClInclude Include="M2DVorschau.h" />
+    <ClInclude Include="M2DPreview.h" />
     <ClInclude Include="Model3D.h" />
     <ClInclude Include="Model3DList.h" />
     <ClInclude Include="Pair.h" />
@@ -273,90 +273,90 @@ copy "x64\Release\Framework.dll" "..\..\Spiele Platform\SMP\Fertig\x64\framework
     <ClInclude Include="Reader.h" />
     <ClInclude Include="Rect2.h" />
     <ClInclude Include="Shader.h" />
-    <ClInclude Include="Textur.h" />
-    <ClInclude Include="Textur2D.h" />
-    <ClInclude Include="TexturList.h" />
-    <ClInclude Include="TexturModel.h" />
-    <ClInclude Include="Ebene3D.h" />
+    <ClInclude Include="Texture.h" />
+    <ClInclude Include="Texture2D.h" />
+    <ClInclude Include="TextureList.h" />
+    <ClInclude Include="TextureModel.h" />
+    <ClInclude Include="Plane3D.h" />
     <ClInclude Include="Tree.h" />
     <ClInclude Include="Trie.h" />
     <ClInclude Include="UIInitialization.h" />
     <ClInclude Include="UIMLView.h" />
     <ClInclude Include="VecN.h" />
-    <ClInclude Include="Welt2D.h" />
-    <ClInclude Include="Welt3D.h" />
+    <ClInclude Include="World2D.h" />
+    <ClInclude Include="World3D.h" />
     <ClInclude Include="Writer.h" />
     <ClInclude Include="XML.h" />
-    <ClInclude Include="Zeichnung.h" />
-    <ClInclude Include="Prozess.h" />
-    <ClInclude Include="Punkt.h" />
-    <ClInclude Include="Rahmen.h" />
+    <ClInclude Include="Drawing.h" />
+    <ClInclude Include="Process.h" />
+    <ClInclude Include="Point.h" />
+    <ClInclude Include="Border.h" />
     <ClInclude Include="RenderThread.h" />
     <ClInclude Include="Key.h" />
-    <ClInclude Include="Schrift.h" />
+    <ClInclude Include="Font.h" />
     <ClInclude Include="Scroll.h" />
-    <ClInclude Include="Tabelle.h" />
-    <ClInclude Include="TastaturEreignis.h" />
+    <ClInclude Include="Table.h" />
+    <ClInclude Include="KeyboardEvent.h" />
     <ClInclude Include="Text.h" />
-    <ClInclude Include="TextFeld.h" />
+    <ClInclude Include="TextField.h" />
     <ClInclude Include="Thread.h" />
     <ClInclude Include="ToolTip.h" />
-    <ClInclude Include="Betriebssystem.h" />
+    <ClInclude Include="OperatingSystem.h" />
     <ClInclude Include="Vec2.h" />
     <ClInclude Include="Vec3.h" />
-    <ClInclude Include="Zeichnung3D.h" />
-    <ClInclude Include="Zeit.h" />
+    <ClInclude Include="Drawing3D.h" />
+    <ClInclude Include="Time.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AbstractElement.cpp" />
-    <ClCompile Include="AlphaFeld.cpp" />
+    <ClCompile Include="AlphaField.cpp" />
     <ClCompile Include="Animation.cpp" />
     <ClCompile Include="Animation3D.cpp" />
     <ClCompile Include="Assembly.cpp" />
     <ClCompile Include="AsynchronCall.cpp" />
-    <ClCompile Include="AuswahlBox.cpp" />
+    <ClCompile Include="SelectionBox.cpp" />
     <ClCompile Include="Console.cpp" />
     <ClCompile Include="DataValidator.cpp" />
     <ClCompile Include="JsonEditor.cpp" />
     <ClCompile Include="Logging.cpp" />
     <ClCompile Include="Regex.cpp" />
     <ClCompile Include="Base64.cpp" />
-    <ClCompile Include="Bild.cpp" />
-    <ClCompile Include="Bildschirm.cpp" />
+    <ClCompile Include="Image.cpp" />
+    <ClCompile Include="Screen.cpp" />
     <ClCompile Include="DX12Buffer.cpp" />
     <ClCompile Include="DX12CommandQueue.cpp" />
     <ClCompile Include="Critical.cpp" />
     <ClCompile Include="Cube.cpp" />
-    <ClCompile Include="Datei.cpp" />
-    <ClCompile Include="DateiDialog.cpp" />
-    <ClCompile Include="DateiSystem.cpp" />
-    <ClCompile Include="Diagramm.cpp" />
+    <ClCompile Include="File.cpp" />
+    <ClCompile Include="FileDialog.cpp" />
+    <ClCompile Include="FileSystem.cpp" />
+    <ClCompile Include="Diagram.cpp" />
     <ClCompile Include="Dialog.cpp" />
     <ClCompile Include="DLLRegister.cpp" />
     <ClCompile Include="DX11GraphicsApi.cpp" />
     <ClCompile Include="DX12GraphicsApi.cpp" />
     <ClCompile Include="DX12Shader.cpp" />
-    <ClCompile Include="DX12Textur.cpp" />
+    <ClCompile Include="DX12Texture.cpp" />
     <ClCompile Include="DX9GraphicsApi.cpp" />
     <ClCompile Include="DXBuffer.cpp" />
     <ClCompile Include="Errors.cpp" />
-    <ClCompile Include="Fenster.cpp" />
-    <ClCompile Include="Fortschritt.cpp" />
+    <ClCompile Include="Window.cpp" />
+    <ClCompile Include="Progress.cpp" />
     <ClCompile Include="Global.cpp" />
     <ClCompile Include="GraphicsApi.cpp" />
-    <ClCompile Include="InitDatei.cpp" />
+    <ClCompile Include="InitFile.cpp" />
     <ClCompile Include="InMemoryBuffer.cpp" />
     <ClCompile Include="JSON.cpp" />
-    <ClCompile Include="Kam3D.cpp" />
-    <ClCompile Include="Kamera2D.cpp" />
-    <ClCompile Include="Knopf.cpp" />
-    <ClCompile Include="KSGTDatei.cpp" />
-    <ClCompile Include="Liste.cpp" />
-    <ClCompile Include="M2Datei.cpp" />
-    <ClCompile Include="M2DVorschau.cpp" />
-    <ClCompile Include="M3Datei.cpp" />
-    <ClCompile Include="Maus.cpp" />
-    <ClCompile Include="MausEreignis.cpp" />
+    <ClCompile Include="Camera3D.cpp" />
+    <ClCompile Include="Camera2D.cpp" />
+    <ClCompile Include="Button.cpp" />
+    <ClCompile Include="KSGTFile.cpp" />
+    <ClCompile Include="List.cpp" />
+    <ClCompile Include="M2File.cpp" />
+    <ClCompile Include="M2DPreview.cpp" />
+    <ClCompile Include="M3File.cpp" />
+    <ClCompile Include="Mouse.cpp" />
+    <ClCompile Include="MouseEvent.cpp" />
     <ClCompile Include="Model2D.cpp" />
     <ClCompile Include="Model3D.cpp" />
     <ClCompile Include="Model3DCollection.cpp" />
@@ -369,33 +369,33 @@ copy "x64\Release\Framework.dll" "..\..\Spiele Platform\SMP\Fertig\x64\framework
     <ClCompile Include="Shader.cpp" />
     <ClCompile Include="Slider.cpp" />
     <ClCompile Include="Supplier.h" />
-    <ClCompile Include="Textur.cpp" />
-    <ClCompile Include="Textur2D.cpp" />
-    <ClCompile Include="TexturList.cpp" />
-    <ClCompile Include="TexturModel.cpp" />
+    <ClCompile Include="Texture.cpp" />
+    <ClCompile Include="Texture2D.cpp" />
+    <ClCompile Include="TextureList.cpp" />
+    <ClCompile Include="TextureModel.cpp" />
     <ClCompile Include="UIDialog.cpp" />
     <ClCompile Include="UIInitialization.cpp" />
     <ClCompile Include="UIMLView.cpp" />
-    <ClCompile Include="Welt2D.cpp" />
-    <ClCompile Include="Welt3D.cpp" />
+    <ClCompile Include="World2D.cpp" />
+    <ClCompile Include="World3D.cpp" />
     <ClCompile Include="Writer.cpp" />
     <ClCompile Include="XML.cpp" />
-    <ClCompile Include="Zeichnung3D.cpp" />
-    <ClCompile Include="Zeichnung.cpp" />
-    <ClCompile Include="Prozess.cpp" />
-    <ClCompile Include="Punkt.cpp" />
-    <ClCompile Include="Rahmen.cpp" />
+    <ClCompile Include="Drawing3D.cpp" />
+    <ClCompile Include="Drawing.cpp" />
+    <ClCompile Include="Process.cpp" />
+    <ClCompile Include="Point.cpp" />
+    <ClCompile Include="Border.cpp" />
     <ClCompile Include="RenderThread.cpp" />
     <ClCompile Include="Key.cpp" />
-    <ClCompile Include="Schrift.cpp" />
+    <ClCompile Include="Font.cpp" />
     <ClCompile Include="Scroll.cpp" />
-    <ClCompile Include="Tabelle.cpp" />
-    <ClCompile Include="TastaturEreignis.cpp" />
+    <ClCompile Include="Table.cpp" />
+    <ClCompile Include="KeyboardEvent.cpp" />
     <ClCompile Include="Text.cpp" />
-    <ClCompile Include="TextFeld.cpp" />
+    <ClCompile Include="TextField.cpp" />
     <ClCompile Include="Thread.cpp" />
     <ClCompile Include="ToolTip.cpp" />
-    <ClCompile Include="Zeit.cpp" />
+    <ClCompile Include="Time.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -489,6 +489,7 @@ copy "x64\Release\Framework.dll" "..\..\Spiele Platform\SMP\Fertig\x64\framework
   <ItemGroup>
     <None Include="ClassDiagram.cd" />
     <None Include="cpp.hint" />
+    <None Include="rename-plan.md" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Framework.vcxproj.filters

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Ressourcendateien">
+    <Filter Include="Resources">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
@@ -11,34 +11,34 @@
     <Filter Include="Framework\OS">
       <UniqueIdentifier>{446e41c7-ea7d-4519-9cd1-1238232b08f8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\OS\Datei">
+    <Filter Include="Framework\OS\File">
       <UniqueIdentifier>{fbd720d3-b19c-4501-b4dd-600cdbbea72d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik">
+    <Filter Include="Framework\Graphics">
       <UniqueIdentifier>{d87f71ae-4946-4766-a9e3-e93f41e7f079}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik\3D">
+    <Filter Include="Framework\Graphics\3D">
       <UniqueIdentifier>{c3d8b482-b58f-48c6-9945-797f38a60fcf}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik\2D">
+    <Filter Include="Framework\Graphics\2D">
       <UniqueIdentifier>{98ccc730-0ee3-4075-bfba-8998571c99e5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik\4D">
+    <Filter Include="Framework\Graphics\4D">
       <UniqueIdentifier>{638c4ef2-2ea4-4d4f-872a-f2012f97a696}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik\DX">
+    <Filter Include="Framework\Graphics\DX">
       <UniqueIdentifier>{cbb56eda-8286-4f8b-9a06-47b5af838106}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik\DX\Shader">
+    <Filter Include="Framework\Graphics\DX\Shader">
       <UniqueIdentifier>{37ae3fd2-27b5-4878-a15c-2c7fe2c8779f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Grafik\DX\DX12">
+    <Filter Include="Framework\Graphics\DX\DX12">
       <UniqueIdentifier>{2f5e8a0f-d55f-427f-ba12-dc88fe967dd5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Objekte3D">
+    <Filter Include="Framework\Objects3D">
       <UniqueIdentifier>{28760380-5f68-43aa-87ae-353d20cad63d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Framework\Objekte2D">
+    <Filter Include="Framework\Objects2D">
       <UniqueIdentifier>{c85aabf4-2e43-4a74-90bc-2d92b7bf3259}</UniqueIdentifier>
     </Filter>
     <Filter Include="Framework\Data">
@@ -68,87 +68,87 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Model2D.h">
-      <Filter>Framework\Grafik\2D</Filter>
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
     <ClInclude Include="Vec2.h">
-      <Filter>Framework\Grafik\2D</Filter>
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
     <ClInclude Include="Vec3.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
     <ClInclude Include="Mat3.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
-    <ClInclude Include="AlphaFeld.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="AlphaField.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Knopf.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Button.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Fenster.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Window.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Fortschritt.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Progress.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Liste.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="List.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Diagramm.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Diagram.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Rahmen.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Border.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Tabelle.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Table.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="TextFeld.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="TextField.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
     <ClInclude Include="ToolTip.h">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
     <ClInclude Include="Scroll.h">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Bildschirm.h">
-      <Filter>Framework\Grafik\DX</Filter>
+    <ClInclude Include="Screen.h">
+      <Filter>Framework\Graphics\DX</Filter>
     </ClInclude>
-    <ClInclude Include="Betriebssystem.h">
+    <ClInclude Include="OperatingSystem.h">
       <Filter>Framework\OS</Filter>
     </ClInclude>
-    <ClInclude Include="AuswahlBox.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="SelectionBox.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Prozess.h">
+    <ClInclude Include="Process.h">
       <Filter>Framework\OS</Filter>
     </ClInclude>
     <ClInclude Include="Thread.h">
       <Filter>Framework\OS</Filter>
     </ClInclude>
-    <ClInclude Include="Bild.h">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClInclude Include="Image.h">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
     <ClInclude Include="RenderThread.h">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClInclude>
-    <ClInclude Include="MausEreignis.h">
+    <ClInclude Include="MouseEvent.h">
       <Filter>Framework</Filter>
     </ClInclude>
-    <ClInclude Include="TastaturEreignis.h">
+    <ClInclude Include="KeyboardEvent.h">
       <Filter>Framework</Filter>
     </ClInclude>
-    <ClInclude Include="Maus.h">
+    <ClInclude Include="Mouse.h">
       <Filter>Framework\OS</Filter>
     </ClInclude>
-    <ClInclude Include="Schrift.h">
+    <ClInclude Include="Font.h">
       <Filter>Framework</Filter>
     </ClInclude>
     <ClInclude Include="Text.h">
       <Filter>Framework</Filter>
     </ClInclude>
-    <ClInclude Include="Punkt.h">
+    <ClInclude Include="Point.h">
       <Filter>Framework</Filter>
     </ClInclude>
     <ClInclude Include="Globals.h">
@@ -160,83 +160,83 @@
     <ClInclude Include="main.h">
       <Filter>Framework</Filter>
     </ClInclude>
-    <ClInclude Include="Zeit.h">
+    <ClInclude Include="Time.h">
       <Filter>Framework</Filter>
     </ClInclude>
-    <ClInclude Include="Datei.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="File.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
-    <ClInclude Include="DateiSystem.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="FileSystem.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
-    <ClInclude Include="InitDatei.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="InitFile.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
-    <ClInclude Include="KSGTDatei.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="KSGTFile.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
-    <ClInclude Include="M2Datei.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="M2File.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
-    <ClInclude Include="DateiDialog.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="FileDialog.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
-    <ClInclude Include="M2DVorschau.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="M2DPreview.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Zeichnung.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Drawing.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="M3Datei.h">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClInclude Include="M3File.h">
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
     <ClInclude Include="Model3D.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
-    <ClInclude Include="Zeichnung3D.h">
-      <Filter>Framework\Objekte3D</Filter>
+    <ClInclude Include="Drawing3D.h">
+      <Filter>Framework\Objects3D</Filter>
     </ClInclude>
     <ClInclude Include="Mat4.h">
-      <Filter>Framework\Grafik\4D</Filter>
+      <Filter>Framework\Graphics\4D</Filter>
     </ClInclude>
-    <ClInclude Include="Kam3D.h">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClInclude Include="Camera3D.h">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
-    <ClInclude Include="DreieckListe.h">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClInclude Include="TriangleList.h">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
-    <ClInclude Include="Welt3D.h">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClInclude Include="World3D.h">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
-    <ClInclude Include="Textur.h">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClInclude Include="Texture.h">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
     <ClInclude Include="DXBuffer.h">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClInclude>
     <ClInclude Include="Cube.h">
-      <Filter>Framework\Objekte3D</Filter>
+      <Filter>Framework\Objects3D</Filter>
     </ClInclude>
     <ClInclude Include="Model3DList.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
-    <ClInclude Include="TexturList.h">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClInclude Include="TextureList.h">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
     <ClInclude Include="Animation3D.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
-    <ClInclude Include="TexturModel.h">
-      <Filter>Framework\Objekte3D</Filter>
+    <ClInclude Include="TextureModel.h">
+      <Filter>Framework\Objects3D</Filter>
     </ClInclude>
     <ClInclude Include="Shader.h">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClInclude>
     <ClInclude Include="Animation.h">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Ebene3D.h">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClInclude Include="Plane3D.h">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClInclude>
     <ClInclude Include="Key.h">
       <Filter>Framework</Filter>
@@ -250,23 +250,23 @@
     <ClInclude Include="Random.h">
       <Filter>Framework</Filter>
     </ClInclude>
-    <ClInclude Include="Textur2D.h">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClInclude Include="Texture2D.h">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
-    <ClInclude Include="Kamera2D.h">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClInclude Include="Camera2D.h">
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
-    <ClInclude Include="Welt2D.h">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClInclude Include="World2D.h">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
     <ClInclude Include="Rect2.h">
-      <Filter>Framework\Grafik\2D</Filter>
+      <Filter>Framework\Graphics\2D</Filter>
     </ClInclude>
     <ClInclude Include="Dialog.h">
       <Filter>Framework</Filter>
     </ClInclude>
     <ClInclude Include="UIMLView.h">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
     <ClInclude Include="Array.h">
       <Filter>Framework\Data</Filter>
@@ -287,16 +287,16 @@
       <Filter>Framework</Filter>
     </ClInclude>
     <ClInclude Include="GraphicsApi.h">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClInclude>
     <ClInclude Include="DLLRegister.h">
       <Filter>Framework\OS</Filter>
     </ClInclude>
     <ClInclude Include="UIDialog.h">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
     <ClInclude Include="Slider.h">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClInclude>
     <ClInclude Include="ReferenceCounter.h">
       <Filter>Framework</Filter>
@@ -329,28 +329,28 @@
       <Filter>Framework\Data</Filter>
     </ClInclude>
     <ClInclude Include="d3dx12.h">
-      <Filter>Framework\Grafik\DX\DX12</Filter>
+      <Filter>Framework\Graphics\DX\DX12</Filter>
     </ClInclude>
     <ClInclude Include="DX12CommandQueue.h">
-      <Filter>Framework\Grafik\DX\DX12</Filter>
+      <Filter>Framework\Graphics\DX\DX12</Filter>
     </ClInclude>
     <ClInclude Include="DX12Buffer.h">
-      <Filter>Framework\Grafik\DX\DX12</Filter>
+      <Filter>Framework\Graphics\DX\DX12</Filter>
     </ClInclude>
     <ClInclude Include="DX12Shader.h">
-      <Filter>Framework\Grafik\DX\DX12</Filter>
+      <Filter>Framework\Graphics\DX\DX12</Filter>
     </ClInclude>
-    <ClInclude Include="DX12Textur.h">
-      <Filter>Framework\Grafik\DX\DX12</Filter>
+    <ClInclude Include="DX12Texture.h">
+      <Filter>Framework\Graphics\DX\DX12</Filter>
     </ClInclude>
     <ClInclude Include="ImmutablePair.h">
       <Filter>Framework\Data</Filter>
     </ClInclude>
     <ClInclude Include="VecN.h">
-      <Filter>Framework\Grafik</Filter>
+      <Filter>Framework\Graphics</Filter>
     </ClInclude>
     <ClInclude Include="ObjFile.h">
-      <Filter>Framework\OS\Datei</Filter>
+      <Filter>Framework\OS\File</Filter>
     </ClInclude>
     <ClInclude Include="Base64.h">
       <Filter>Framework</Filter>
@@ -394,76 +394,76 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Model3DCollection.h">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
-    <ClCompile Include="Bild.cpp">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClCompile Include="Image.cpp">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClCompile>
     <ClCompile Include="Model2D.cpp">
-      <Filter>Framework\Grafik\2D</Filter>
+      <Filter>Framework\Graphics\2D</Filter>
     </ClCompile>
-    <ClCompile Include="Textur2D.cpp">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClCompile Include="Texture2D.cpp">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClCompile>
-    <ClCompile Include="Welt2D.cpp">
-      <Filter>Framework\Grafik\2D</Filter>
+    <ClCompile Include="World2D.cpp">
+      <Filter>Framework\Graphics\2D</Filter>
     </ClCompile>
     <ClCompile Include="Animation3D.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
-    <ClCompile Include="Kam3D.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClCompile Include="Camera3D.cpp">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
     <ClCompile Include="Model3D.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
     <ClCompile Include="Model3DList.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
-    <ClCompile Include="Textur.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClCompile Include="Texture.cpp">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
-    <ClCompile Include="TexturList.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClCompile Include="TextureList.cpp">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
-    <ClCompile Include="Welt3D.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+    <ClCompile Include="World3D.cpp">
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
     <ClCompile Include="DX12Buffer.cpp">
-      <Filter>Framework\Grafik\DX\DX12</Filter>
+      <Filter>Framework\Graphics\DX\DX12</Filter>
     </ClCompile>
     <ClCompile Include="DX12CommandQueue.cpp">
-      <Filter>Framework\Grafik\DX\DX12</Filter>
+      <Filter>Framework\Graphics\DX\DX12</Filter>
     </ClCompile>
     <ClCompile Include="DX12GraphicsApi.cpp">
-      <Filter>Framework\Grafik\DX\DX12</Filter>
+      <Filter>Framework\Graphics\DX\DX12</Filter>
     </ClCompile>
     <ClCompile Include="DX12Shader.cpp">
-      <Filter>Framework\Grafik\DX\DX12</Filter>
+      <Filter>Framework\Graphics\DX\DX12</Filter>
     </ClCompile>
-    <ClCompile Include="DX12Textur.cpp">
-      <Filter>Framework\Grafik\DX\DX12</Filter>
+    <ClCompile Include="DX12Texture.cpp">
+      <Filter>Framework\Graphics\DX\DX12</Filter>
     </ClCompile>
-    <ClCompile Include="Bildschirm.cpp">
-      <Filter>Framework\Grafik\DX</Filter>
+    <ClCompile Include="Screen.cpp">
+      <Filter>Framework\Graphics\DX</Filter>
     </ClCompile>
     <ClCompile Include="DX9GraphicsApi.cpp">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClCompile>
     <ClCompile Include="DX11GraphicsApi.cpp">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClCompile>
     <ClCompile Include="DXBuffer.cpp">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClCompile>
     <ClCompile Include="GraphicsApi.cpp">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClCompile>
     <ClCompile Include="RenderThread.cpp">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClCompile>
     <ClCompile Include="Shader.cpp">
-      <Filter>Framework\Grafik\DX</Filter>
+      <Filter>Framework\Graphics\DX</Filter>
     </ClCompile>
     <ClCompile Include="InMemoryBuffer.cpp">
       <Filter>Framework\IO</Filter>
@@ -474,95 +474,95 @@
     <ClCompile Include="Writer.cpp">
       <Filter>Framework\IO</Filter>
     </ClCompile>
-    <ClCompile Include="AlphaFeld.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="AlphaField.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="Animation.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="AuswahlBox.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="SelectionBox.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Diagramm.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Diagram.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Fenster.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Window.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Fortschritt.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Progress.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Kamera2D.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Camera2D.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Knopf.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Button.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Liste.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="List.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="M2DVorschau.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="M2DPreview.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Rahmen.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Border.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="Scroll.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="Slider.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Tabelle.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Table.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="TextFeld.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="TextField.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="ToolTip.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="UIDialog.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="UIMLView.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
-    <ClCompile Include="Zeichnung.cpp">
-      <Filter>Framework\Objekte2D</Filter>
+    <ClCompile Include="Drawing.cpp">
+      <Filter>Framework\Objects2D</Filter>
     </ClCompile>
     <ClCompile Include="Cube.cpp">
-      <Filter>Framework\Objekte3D</Filter>
+      <Filter>Framework\Objects3D</Filter>
     </ClCompile>
-    <ClCompile Include="TexturModel.cpp">
-      <Filter>Framework\Objekte3D</Filter>
+    <ClCompile Include="TextureModel.cpp">
+      <Filter>Framework\Objects3D</Filter>
     </ClCompile>
-    <ClCompile Include="Zeichnung3D.cpp">
-      <Filter>Framework\Objekte3D</Filter>
+    <ClCompile Include="Drawing3D.cpp">
+      <Filter>Framework\Objects3D</Filter>
     </ClCompile>
-    <ClCompile Include="Datei.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="File.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
-    <ClCompile Include="DateiDialog.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="FileDialog.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
-    <ClCompile Include="DateiSystem.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="FileSystem.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
-    <ClCompile Include="InitDatei.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="InitFile.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
-    <ClCompile Include="KSGTDatei.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="KSGTFile.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
-    <ClCompile Include="M2Datei.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="M2File.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
-    <ClCompile Include="M3Datei.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+    <ClCompile Include="M3File.cpp">
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
     <ClCompile Include="ObjFile.cpp">
-      <Filter>Framework\OS\Datei</Filter>
+      <Filter>Framework\OS\File</Filter>
     </ClCompile>
     <ClCompile Include="AsynchronCall.cpp">
       <Filter>Framework\OS</Filter>
@@ -573,10 +573,10 @@
     <ClCompile Include="DLLRegister.cpp">
       <Filter>Framework\OS</Filter>
     </ClCompile>
-    <ClCompile Include="Maus.cpp">
+    <ClCompile Include="Mouse.cpp">
       <Filter>Framework\OS</Filter>
     </ClCompile>
-    <ClCompile Include="Prozess.cpp">
+    <ClCompile Include="Process.cpp">
       <Filter>Framework\OS</Filter>
     </ClCompile>
     <ClCompile Include="Thread.cpp">
@@ -597,10 +597,10 @@
     <ClCompile Include="Key.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
-    <ClCompile Include="MausEreignis.cpp">
+    <ClCompile Include="MouseEvent.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
-    <ClCompile Include="Punkt.cpp">
+    <ClCompile Include="Point.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
     <ClCompile Include="Random.cpp">
@@ -609,10 +609,10 @@
     <ClCompile Include="ReferenceCounter.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
-    <ClCompile Include="Schrift.cpp">
+    <ClCompile Include="Font.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
-    <ClCompile Include="TastaturEreignis.cpp">
+    <ClCompile Include="KeyboardEvent.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
     <ClCompile Include="Text.cpp">
@@ -621,11 +621,11 @@
     <ClCompile Include="UIInitialization.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
-    <ClCompile Include="Zeit.cpp">
+    <ClCompile Include="Time.cpp">
       <Filter>Framework</Filter>
     </ClCompile>
     <ClCompile Include="Model3DCollection.cpp">
-      <Filter>Framework\Grafik\3D</Filter>
+      <Filter>Framework\Graphics\3D</Filter>
     </ClCompile>
     <ClCompile Include="Regex.cpp">
       <Filter>Framework\Regex</Filter>
@@ -660,20 +660,21 @@
   </ItemGroup>
   <ItemGroup>
     <FxCompile Include="DX12VertexShader.hlsl">
-      <Filter>Framework\Grafik\DX\Shader</Filter>
+      <Filter>Framework\Graphics\DX\Shader</Filter>
     </FxCompile>
     <FxCompile Include="DX11VertexShader.hlsl">
-      <Filter>Framework\Grafik\DX\Shader</Filter>
+      <Filter>Framework\Graphics\DX\Shader</Filter>
     </FxCompile>
     <FxCompile Include="DX11PixelShader.hlsl">
-      <Filter>Framework\Grafik\DX\Shader</Filter>
+      <Filter>Framework\Graphics\DX\Shader</Filter>
     </FxCompile>
     <FxCompile Include="DX12PixelShader.hlsl">
-      <Filter>Framework\Grafik\DX\Shader</Filter>
+      <Filter>Framework\Graphics\DX\Shader</Filter>
     </FxCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="ClassDiagram.cd" />
     <None Include="cpp.hint" />
+    <None Include="rename-plan.md" />
   </ItemGroup>
 </Project>

FrameworkMath.h

@@ -4,7 +4,7 @@
 #include <functional>
 #include <math.h>
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 
 namespace Framework
 {

Funktion.h → Function.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Feld.h"
-#include "Sichtbarkeit.h"
+#include "Field.h"
+#include "Visibility.h"
 #include "Text.h"
-#include "Typ.h"
+#include "Type.h"
 
 namespace Framework
 {

Global.cpp

@@ -4,21 +4,21 @@
 #    include <objidl.h>
 #endif
 
-#include "Datei.h"
+#include "File.h"
 #include "DLLRegister.h"
-#include "Fenster.h"
+#include "Window.h"
 #include "Globals.h"
 #include "Logging.h"
 #include "Model3DList.h"
-#include "TexturList.h"
+#include "TextureList.h"
 #include "Thread.h"
-#include "Zeit.h"
+#include "Time.h"
 
 #ifdef WIN32
 #    include <GdiPlus.h>
 #    pragma comment(lib, "gdiplus.lib")
-#    include "Fenster.h"
-#    include "Maus.h"
+#    include "Window.h"
+#    include "Mouse.h"
 #endif
 
 void Framework::initFramework(HINSTANCE__* hInst)

Globals.h

@@ -2,10 +2,10 @@
 #define Globals_H
 
 #include "Critical.h"
-#include "Punkt.h"
+#include "Point.h"
 
 #ifdef WIN32
-#    include "Maus.h"
+#    include "Mouse.h"
 #endif
 
 #ifndef Global
@@ -19,8 +19,8 @@ namespace Framework
     class ThreadRegister; //! Thread.h
     class Thread;         //! Thread.h
     class Model3DList;    //! Model3DList.h
-    class TexturList;     //! TexturList.h
-    class Datei;          //! Datei.h
+    class TexturList;     //! TextureList.h
+    class Datei;          //! File.h
     class DLLRegister;    //! DLLRegister.h
 
     namespace Logging
@@ -29,8 +29,8 @@ namespace Framework
     }
 
 #ifdef WIN32
-    class Maus;          //! Maus.h
-    class WFensterArray; //! Fenster.h
+    class Maus;          //! Mouse.h
+    class WFensterArray; //! Window.h
 
     Global WFensterArray WFensterA;
     Global bool MausTrack;
@@ -55,12 +55,12 @@ namespace Framework
 #endif
     //! Returns whether a mouse button is currently pressed
     //! \param taste The button to check
-    //! Example: getMausStand( M_Links ); (Requires include <MausEreignis.h>)
+    //! Example: getMausStand( M_Links ); (Requires include <MouseEvent.h>)
     DLLEXPORT bool getMausStand(int taste);
     //! Returns whether a keyboard key is currently pressed
     //! \param taste The key to check
     //! Example: getTastenStand( T_Enter ); (Requires include
-    //! <TastaturEreignis.h>)
+    //! <KeyboardEvent.h>)
     DLLEXPORT bool getTastenStand(unsigned char taste);
     //! Initializes the framework.
     //! Called automatically in the framework's (WinMain)

GraphicsApi.cpp

@@ -1,7 +1,7 @@
 #include "GraphicsApi.h"
 
-#include "Bild.h"
-#include "Fenster.h"
+#include "Image.h"
+#include "Window.h"
 #include "Model3D.h"
 #include "Model3DList.h"
 

GraphicsApi.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Bildschirm.h"
-#include "Ebene3D.h"
+#include "Screen.h"
+#include "Plane3D.h"
 #include "Mat4.h"
 #include "Vec2.h"
 

Bild.cpp → Image.cpp

@@ -1,15 +1,15 @@
 //---Include---
-#include "Bild.h"
+#include "Image.h"
 
 #ifdef WIN32
 #    include <objidl.h>
 #endif
 
-#include "AlphaFeld.h"
-#include "DateiSystem.h"
+#include "AlphaField.h"
+#include "FileSystem.h"
 #include "Globals.h"
-#include "MausEreignis.h"
-#include "Rahmen.h"
+#include "MouseEvent.h"
+#include "Border.h"
 #include "Scroll.h"
 #include "Text.h"
 #include "ToolTip.h"
@@ -33,7 +33,7 @@
 
 using namespace Framework;
 
-// Contents of the Bild class from Bild.h
+// Contents of the Bild class from Image.h
 // Constructor
 Bild::Bild(bool options)
     : ReferenceCounter(),
@@ -2920,7 +2920,7 @@ int Bild::getAverageColor() const
          | ((((int)g) & 0xFF) << 8) | (((int)b) & 0xFF);
 }
 
-// Contents of the BildZ class from Bild.h
+// Contents of the BildZ class from Image.h
 // Constructor
 BildZ::BildZ()
     : ZeichnungHintergrund(),

Bild.h → Image.h

@@ -2,8 +2,8 @@
 #define Bild_H
 
 #include "Array.h"
-#include "Punkt.h"
-#include "Zeichnung.h"
+#include "Point.h"
+#include "Drawing.h"
 
 namespace Framework
 {
@@ -11,8 +11,8 @@ namespace Framework
 #ifdef WIN32
     class VScrollBar;    //! Scroll.h
     class HScrollBar;    //! Scroll.h
-    class Rahmen;        //! Rahmen.h
-    struct MausEreignis; //! MausEreignis.h
+    class Rahmen;        //! Border.h
+    struct MausEreignis; //! MouseEvent.h
     class Text;          //! Text.h
 #endif
 

InitDatei.cpp → InitFile.cpp

@@ -1,11 +1,11 @@
-#include "InitDatei.h"
+#include "InitFile.h"
 
-#include "Datei.h"
+#include "File.h"
 #include "Text.h"
 
 using namespace Framework;
 
-// Contents of the InitDatei class from InitDatei.h
+// Contents of the InitDatei class from InitFile.h
 // Constructor
 InitDatei::InitDatei()
     : ReferenceCounter(),

JSON.cpp

@@ -1,6 +1,6 @@
-#include "JSON.h"
+#include "JSON.h"
 
-#include "Datei.h"
+#include "File.h"
 
 using namespace Framework;
 using namespace JSON;

JsonEditor.cpp

@@ -1,12 +1,12 @@
-#include "JsonEditor.h"
+#include "JsonEditor.h"
 
-#include "Bild.h"
+#include "Image.h"
 #include "Globals.h"
-#include "MausEreignis.h"
+#include "MouseEvent.h"
 #include "Regex.h"
-#include "Schrift.h"
-#include "TastaturEreignis.h"
-#include "TextFeld.h"
+#include "Font.h"
+#include "KeyboardEvent.h"
+#include "TextField.h"
 
 using namespace Framework;
 using namespace JSON;

JsonEditor.h

@@ -6,7 +6,7 @@
 #include "Stack.h"
 #include "Text.h"
 #include "UIInitialization.h"
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {

KSGTDatei.cpp → KSGTFile.cpp

@@ -1,11 +1,11 @@
-#include "KSGTDatei.h"
+#include "KSGTFile.h"
 
-#include "Datei.h"
+#include "File.h"
 #include "Text.h"
 
 using namespace Framework;
 
-// Contents of the KSGTDatei class from KSGTDatei.h
+// Contents of the KSGTDatei class from KSGTFile.h
 // Constructor
 KSGTDatei::KSGTDatei()
     : ReferenceCounter(),

Key.h

@@ -1,7 +1,7 @@
 #ifndef Key_H
 #define Key_H
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 #include "ReferenceCounter.h"
 
 namespace Framework

TastaturEreignis.cpp → KeyboardEvent.cpp

@@ -1,4 +1,4 @@
-#include "TastaturEreignis.h"
+#include "KeyboardEvent.h"
 
 using namespace Framework;
 

TastaturEreignis.h → KeyboardEvent.h

@@ -3,7 +3,7 @@
 
 #include <functional>
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 
 namespace Framework
 {

Liste.cpp → List.cpp

@@ -1,20 +1,20 @@
-#include "Liste.h"
+#include "List.h"
 
-#include "AlphaFeld.h"
+#include "AlphaField.h"
 #include "Array.h"
-#include "Bild.h"
+#include "Image.h"
 #include "Globals.h"
-#include "MausEreignis.h"
-#include "Rahmen.h"
-#include "Schrift.h"
+#include "MouseEvent.h"
+#include "Border.h"
+#include "Font.h"
 #include "Scroll.h"
-#include "TastaturEreignis.h"
+#include "KeyboardEvent.h"
 #include "Text.h"
-#include "TextFeld.h"
+#include "TextField.h"
 
 using namespace Framework;
 
-// Contents of the AuswahlListe class from Liste.h
+// Contents of the AuswahlListe class from List.h
 // Constructor
 AuswahlListe::AuswahlListe()
     : ZeichnungHintergrund(),

Liste.h → List.h

@@ -2,19 +2,19 @@
 #define Liste_H
 
 #include "Array.h"
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
-    class Rahmen;            //! Rahmen.h
-    class AlphaFeld;         //! AlphaFeld.h
-    class Bild;              //! Bild.h
+    class Rahmen;            //! Border.h
+    class AlphaFeld;         //! AlphaField.h
+    class Bild;              //! Image.h
     class Text;              //! Text.h
-    class TextFeld;          //! TextFeld.h
+    class TextFeld;          //! TextField.h
     class VScrollBar;        //! Scroll.h
-    struct TastaturEreignis; //! TastaturEreignis.h
-    struct MausEreignis;     //! MausEreignis.h
-    class Schrift;           //! Schrift.h
+    struct TastaturEreignis; //! KeyboardEvent.h
+    struct MausEreignis;     //! MouseEvent.h
+    class Schrift;           //! Font.h
     class AuswahlListe;      //! from this file
 
     //! A drawing of the 2D GUI Framework that displays a list from which

Logging.cpp

@@ -1,10 +1,10 @@
-#include "Logging.h"
+#include "Logging.h"
 
 #include <iostream>
 
-#include "Datei.h"
+#include "File.h"
 #include "Globals.h"
-#include "Zeit.h"
+#include "Time.h"
 
 using namespace Framework;
 using namespace Framework::Logging;

M2DVorschau.cpp → M2DPreview.cpp

@@ -1,16 +1,16 @@
-#include "M2DVorschau.h"
+#include "M2DPreview.h"
 
-#include "AlphaFeld.h"
-#include "Bild.h"
+#include "AlphaField.h"
+#include "Image.h"
 #include "Globals.h"
-#include "MausEreignis.h"
+#include "MouseEvent.h"
 #include "Model2D.h"
-#include "Rahmen.h"
+#include "Border.h"
 #include "ToolTip.h"
 
 using namespace Framework;
 
-// Contents of the M2DVorschau class from M2DVorschau.h
+// Contents of the M2DVorschau class from M2DPreview.h
 // Constructor
 M2DVorschau::M2DVorschau()
     : ZeichnungHintergrund()

M2DVorschau.h → M2DPreview.h

@@ -1,14 +1,14 @@
 #pragma once
 
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
     class Model2D;       //! Model2D.h
     class Model2DData;   //! Model2D.h
-    class Rahmen;        //! Rahmen.h
-    class AlphaFeld;     //! AlphaFeld.h
-    struct MausEreignis; //! MausEreignis.h
+    class Rahmen;        //! Border.h
+    class AlphaFeld;     //! AlphaField.h
+    struct MausEreignis; //! MouseEvent.h
 
     //! A 2D GUI framework drawing that displays a 2D model
     class M2DVorschau : public ZeichnungHintergrund

M2Datei.cpp → M2File.cpp

@@ -1,12 +1,12 @@
-#include "M2Datei.h"
+#include "M2File.h"
 
-#include "Datei.h"
+#include "File.h"
 #include "Model2D.h"
 #include "Text.h"
 
 using namespace Framework;
 
-// Contents of the M2Datei class from M2Datei.h
+// Contents of the M2Datei class from M2File.h
 // Constructor
 M2Datei::M2Datei()
     : ReferenceCounter()

M3Datei.cpp → M3File.cpp

@@ -1,12 +1,12 @@
-#include "M3Datei.h"
+#include "M3File.h"
 
-#include "Datei.h"
+#include "File.h"
 #include "GraphicsApi.h"
 #include "Model3D.h"
 
 using namespace Framework;
 
-// Content of the M3Datei class from M3Datei.h
+// Content of the M3Datei class from M3File.h
 // Constructor
 M3Datei::M3Datei()
     : ReferenceCounter()

Maybe.h

@@ -1,8 +1,8 @@
-#pragma once
+#pragma once
 
 #include <functional>
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 
 namespace Framework
 {

Model2D.cpp

@@ -1,10 +1,10 @@
 #include "Model2D.h"
 
-#include "Bild.h"
+#include "Image.h"
 #include "FrameworkMath.h"
 #include "Mat3.h"
-#include "MausEreignis.h"
-#include "Textur2D.h"
+#include "MouseEvent.h"
+#include "Texture2D.h"
 
 using namespace Framework;
 

Model2D.h

@@ -4,11 +4,11 @@
 #include <functional>
 
 #include "Array.h"
-#include "DreieckListe.h"
-#include "Punkt.h"
+#include "TriangleList.h"
+#include "Point.h"
 #include "Vec3.h"
-#include "Welt2D.h"
-#include "Zeichnung.h"
+#include "World2D.h"
+#include "Drawing.h"
 
 namespace Framework
 {

Model3D.cpp

@@ -1,11 +1,11 @@
 #include "Model3D.h"
 
 #include "Animation3D.h"
-#include "Bild.h"
+#include "Image.h"
 #include "DXBuffer.h"
 #include "Model2D.h"
-#include "Textur.h"
-#include "Welt3D.h"
+#include "Texture.h"
+#include "World3D.h"
 #ifdef WIN32
 #    include <d3d11.h>
 #endif

Model3D.h

@@ -3,20 +3,20 @@
 #include "Array.h"
 #include "Mat4.h"
 #include "Vec2.h"
-#include "Zeichnung3D.h"
+#include "Drawing3D.h"
 
 struct ID3D11Buffer;
 
 namespace Framework
 {
     struct Polygon2D;    //! Model2D.h
-    class Textur;        //! Textur.h
+    class Textur;        //! Texture.h
     class Model2DData;   //! Model2D.h
     class DXBuffer;      //! DXBuffer.h
     class Render3D;      //! Render3D.h
     class Model3DTextur; //! Model3D.h
     class Model3DList;   //! Model3DList.h
-    class Welt3D;        //! Welt3D.h
+    class Welt3D;        //! World3D.h
     class DXBuffer;
     class Shader;
     class GraphicsApi;

Maus.cpp → Mouse.cpp

@@ -1,11 +1,11 @@
-#include "Maus.h"
+#include "Mouse.h"
 
-#include "Bild.h"
-#include "Punkt.h"
+#include "Image.h"
+#include "Point.h"
 
 using namespace Framework;
 
-// Contents of the Maus class from Maus.h
+// Contents of the Maus class from Mouse.h
 // Constructor
 Maus::Maus()
     : ReferenceCounter(),

Maus.h → Mouse.h

@@ -1,12 +1,12 @@
 #ifndef Maus_H
 #define Maus_H
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 #include "ReferenceCounter.h"
 
 namespace Framework
 {
-    class Bild; //! from Bild.h
+    class Bild; //! from Image.h
     class Maus; //! from this file
 
     namespace MausId

MausEreignis.cpp → MouseEvent.cpp

@@ -1,6 +1,6 @@
-#include "MausEreignis.h"
+#include "MouseEvent.h"
 
-#include "Fenster.h"
+#include "Window.h"
 
 using namespace Framework;
 

ObjFile.h

@@ -1,7 +1,7 @@
-#pragma once
+#pragma once
 
 #include "Array.h"
-#include "Datei.h"
+#include "File.h"
 #include "ReferenceCounter.h"
 #include "Vec3.h"
 

Punkt.cpp → Point.cpp

@@ -1,7 +1,7 @@
-#include "Punkt.h"
+#include "Point.h"
 #ifdef WIN32
-#    include "Bildschirm.h"
-#    include "Fenster.h"
+#    include "Screen.h"
+#    include "Window.h"
 #endif
 
 using namespace Framework;

Punkt.h → Point.h

@@ -7,7 +7,7 @@
 namespace Framework
 {
     //! required includes
-    class WFenster; //! from Fenster.h
+    class WFenster; //! from Window.h
 
     typedef Vec2<int>
         Punkt; //! Stores the integer coordinates of a point

Prozess.cpp → Process.cpp

@@ -1,4 +1,4 @@
-#include "Prozess.h"
+#include "Process.h"
 #ifdef WIN32
 #    include <Psapi.h>
 #    include <tlHelp32.h>
@@ -10,7 +10,7 @@
 
 using namespace Framework;
 
-// Contents of the Prozess class from Prozess.h
+// Contents of the Prozess class from Process.h
 // Constructor
 Prozess::Prozess()
     : ReferenceCounter()

Prozess.h → Process.h

@@ -1,7 +1,7 @@
 #ifndef Prozess_H
 #define Prozess_H
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 #include "ReferenceCounter.h"
 
 #ifdef WIN32

Fortschritt.cpp → Progress.cpp

@@ -1,15 +1,15 @@
-#include "Fortschritt.h"
+#include "Progress.h"
 
-#include "AlphaFeld.h"
-#include "Bild.h"
-#include "Rahmen.h"
-#include "Schrift.h"
+#include "AlphaField.h"
+#include "Image.h"
+#include "Border.h"
+#include "Font.h"
 #include "Scroll.h"
 #include "Text.h"
 
 using namespace Framework;
 
-// Contents of the FBalken class from Fortschritt.h
+// Contents of the FBalken class from Progress.h
 // Constructor
 FBalken::FBalken()
     : ZeichnungHintergrund(),

Fortschritt.h → Progress.h

@@ -1,14 +1,14 @@
 #ifndef Fortschritt_H
 #define Fortschritt_H
 
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
-    class Rahmen;    //! Rahmen.h
-    class AlphaFeld; //! AlphaFeld.h
-    class Bild;      //! Bild.h
-    class Schrift;   //! Schrift.h
+    class Rahmen;    //! Border.h
+    class AlphaFeld; //! AlphaField.h
+    class Bild;      //! Image.h
+    class Schrift;   //! Font.h
     class FBalken;   //! from this file
     class TextRenderer;
 

RCPointer.h

@@ -1,5 +1,5 @@
-#pragma once
-#include "Betriebssystem.h"
+#pragma once
+#include "OperatingSystem.h"
 
 namespace Framework
 {

Random.cpp

@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include "Zeit.h"
+#include "Time.h"
 
 using namespace Framework;
 

Random.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 #include "ReferenceCounter.h"
 
 namespace Framework

ReferenceCounter.h

@@ -1,6 +1,6 @@
-#pragma once
+#pragma once
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 
 namespace Framework
 {

Reflection.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Klasse.h"
+#include "Class.h"
 
 #define REFLECTABLE_CLASS(NAME)                  \
     class NAME                                   \

RenderThread.cpp

@@ -2,9 +2,9 @@
 
 #include <iostream>
 
-#include "Bildschirm.h"
+#include "Screen.h"
 #include "Logging.h"
-#include "Zeit.h"
+#include "Time.h"
 
 using namespace Framework;
 

RenderThread.h

@@ -8,9 +8,9 @@
 
 namespace Framework
 {
-    class Bildschirm; //! Bildschirm.h
+    class Bildschirm; //! Screen.h
     class ZeitMesser; //! ZeitMesser.h
-    class Bild;       //! Bild.h
+    class Bild;       //! Image.h
 
     //! A thread that manages a screen. It calls the render() and
     //! tick() functions automatically

Bildschirm.cpp → Screen.cpp

@@ -1,20 +1,20 @@
-#include "Bildschirm.h"
+#include "Screen.h"
 
 #include <iostream>
 
-#include "Bild.h"
-#include "Datei.h"
-#include "Fenster.h"
+#include "Image.h"
+#include "File.h"
+#include "Window.h"
 #include "Globals.h"
 #include "GraphicsApi.h"
 #include "Logging.h"
 #include "Mat3.h"
-#include "MausEreignis.h"
+#include "MouseEvent.h"
 #include "Model3D.h"
 #include "Text.h"
 #include "ToolTip.h"
-#include "Zeichnung.h"
-#include "Zeit.h"
+#include "Drawing.h"
+#include "Time.h"
 #ifdef WIN32
 #    include <d3d11.h>
 #    include <d3d9.h>
@@ -22,12 +22,12 @@
 #    include <DirectXMath.h>
 
 #    include "comdef.h"
-#    include "Kam3D.h"
+#    include "Camera3D.h"
 #endif
 
 using namespace Framework;
 
-// Content of the Bildschirm class from Bildschirm.h
+// Content of the Bildschirm class from Screen.h
 // Constructor
 Bildschirm::Bildschirm(WFenster* f)
     : ReferenceCounter(),

Bildschirm.h → Screen.h

@@ -5,9 +5,9 @@
 
 #include "Array.h"
 #include "Critical.h"
-#include "MausEreignis.h"
-#include "Punkt.h"
-#include "TastaturEreignis.h"
+#include "MouseEvent.h"
+#include "Point.h"
+#include "KeyboardEvent.h"
 
 //! DirectX 11 Types
 
@@ -33,23 +33,23 @@ struct _D3DLOCKED_RECT;
 
 namespace Framework
 {
-    class Bild;              //! Bild.h
-    class WFenster;          //! Fenster.h
+    class Bild;              //! Image.h
+    class WFenster;          //! Window.h
     class Bildschirm;        //! from this file
-    class Zeichnung;         //! Zeichnung.h
-    class Zeichnung3D;       //! Zeichnung3D.h
-    class ZeitMesser;        //! Zeit.h
-    struct MausEreignis;     //! MausEreignis.h
-    struct TastaturEreignis; //! TastaturEreignis.h
+    class Zeichnung;         //! Drawing.h
+    class Zeichnung3D;       //! Drawing3D.h
+    class ZeitMesser;        //! Time.h
+    struct MausEreignis;     //! MouseEvent.h
+    struct TastaturEreignis; //! KeyboardEvent.h
     class ToolTip;           //! Tooltip.h
     class PixelShader;       //! Shader.h
     class VertexShader;      //! Shader.h
-    class Kam3D;             //! Kam3D.h
+    class Kam3D;             //! Camera3D.h
     class Render3D;          //! Render3D.h
     class DXVertexBuffer;    //! DXBuffer.h
     class DXIndexBuffer;     //! DXBuffer.h
-    class Textur;            //! Textur.h
-    class TexturModel;       //! TexturModel.h
+    class Textur;            //! Texture.h
+    class TexturModel;       //! TextureModel.h
     class GraphicsApi;       //! GraphicsApi.h
     class DirectX9;          //! GraphicsApi.h
 

Scroll.cpp

@@ -1,7 +1,7 @@
 #include "Scroll.h"
 
-#include "Bild.h"
-#include "MausEreignis.h"
+#include "Image.h"
+#include "MouseEvent.h"
 
 using namespace Framework;
 

Scroll.h

@@ -1,13 +1,13 @@
 #ifndef Scroll_H
 #define Scroll_H
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 #include "ReferenceCounter.h"
 
 namespace Framework
 {
-    class Bild;          //! Bild.h
-    struct MausEreignis; //! MausEreignis.h
+    class Bild;          //! Image.h
+    struct MausEreignis; //! MouseEvent.h
 
     struct ScrollData
     {

AuswahlBox.cpp → SelectionBox.cpp

@@ -1,20 +1,20 @@
-#include "AuswahlBox.h"
-
-#include "AlphaFeld.h"
-#include "Bild.h"
-#include "Knopf.h"
-#include "MausEreignis.h"
-#include "Rahmen.h"
-#include "Schrift.h"
+#include "SelectionBox.h"
+
+#include "AlphaField.h"
+#include "Image.h"
+#include "Button.h"
+#include "MouseEvent.h"
+#include "Border.h"
+#include "Font.h"
 #include "Scroll.h"
-#include "TastaturEreignis.h"
+#include "KeyboardEvent.h"
 #include "Text.h"
-#include "TextFeld.h"
+#include "TextField.h"
 #include "ToolTip.h"
 
 using namespace Framework;
 
-// Contents of the AuswahlBox class from AuswahlBox.h
+// Contents of the AuswahlBox class from SelectionBox.h
 // Constructor
 AuswahlBox::AuswahlBox()
     : ZeichnungHintergrund(),

AuswahlBox.h → SelectionBox.h

@@ -2,17 +2,17 @@
 #define AuswahlBox_H
 
 #include "Array.h"
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
-    class TextFeld;   //! TextFeld.h
+    class TextFeld;   //! TextField.h
     class VScrollBar; //! Scroll.h
-    class Rahmen;     //! Rahmen.h
-    class Knopf;      //! Knopf.h
-    class AlphaFeld;  //! AlphaFeld.h
+    class Rahmen;     //! Border.h
+    class Knopf;      //! Button.h
+    class AlphaFeld;  //! AlphaField.h
     class Text;       //! Tet.h
-    class Schrift;    //! Schrift.h
+    class Schrift;    //! Font.h
     class TextRenderer;
 
     //! A 2D GUI Framework drawing. Represents a box from which

Shader.cpp

@@ -4,7 +4,7 @@
 #include <d3d12.h>
 #include <iostream>
 
-#include "Datei.h"
+#include "File.h"
 #include "DXBuffer.h"
 #include "Text.h"
 

Slider.cpp

@@ -1,6 +1,6 @@
 #include "Slider.h"
 
-#include "Bild.h"
+#include "Image.h"
 #include "Globals.h"
 
 using namespace Framework;

Slider.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {

Tabelle.cpp → Table.cpp

@@ -1,17 +1,17 @@
-#include "Tabelle.h"
+#include "Table.h"
 
-#include "AlphaFeld.h"
-#include "Bild.h"
-#include "MausEreignis.h"
-#include "Rahmen.h"
+#include "AlphaField.h"
+#include "Image.h"
+#include "MouseEvent.h"
+#include "Border.h"
 #include "Scroll.h"
-#include "TastaturEreignis.h"
+#include "KeyboardEvent.h"
 #include "Text.h"
 #include "ToolTip.h"
 
 using namespace Framework;
 
-// Contents of the ObjTabelle class from Tabelle.h
+// Contents of the ObjTabelle class from Table.h
 // Constructor
 ObjTabelle::ObjTabelle()
     : ZeichnungHintergrund(),

Tabelle.h → Table.h

@@ -2,12 +2,12 @@
 #define Tabelle_H
 
 #include "Array.h"
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
-    class Rahmen;     //! Rahmen.h
-    class AlphaFeld;  //! AlphaFeld.h
+    class Rahmen;     //! Border.h
+    class AlphaFeld;  //! AlphaField.h
     class VScrollBar; //! Scroll.h
     class HScrollBar; //! Scroll.h
     class Text;       //! Text.h

TextFeld.cpp → TextField.cpp

@@ -1,16 +1,16 @@
-#include "TextFeld.h"
+#include "TextField.h"
 
 #include <math.h>
 
-#include "AlphaFeld.h"
-#include "Bild.h"
-#include "Fenster.h"
+#include "AlphaField.h"
+#include "Image.h"
+#include "Window.h"
 #include "Globals.h"
-#include "MausEreignis.h"
-#include "Rahmen.h"
-#include "Schrift.h"
+#include "MouseEvent.h"
+#include "Border.h"
+#include "Font.h"
 #include "Scroll.h"
-#include "TastaturEreignis.h"
+#include "KeyboardEvent.h"
 #include "Text.h"
 #include "ToolTip.h"
 
@@ -244,7 +244,7 @@ TextStyle TextFeld::TextStyleManager::getTextStyle(int index) const
     return last;
 }
 
-// Contents of the TextFeld class from TextFeld.h
+// Contents of the TextFeld class from TextField.h
 // Constructor
 TextFeld::TextFeld()
     : ZeichnungHintergrund(),

TextFeld.h → TextField.h

@@ -1,14 +1,14 @@
 #pragma once
 
 #include "Array.h"
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
-    class Schrift;    //! Schrift.h
+    class Schrift;    //! Font.h
     class Text;       //! Text.h
-    class AlphaFeld;  //! AlphaFeld.h
-    class Rahmen;     //! Rahmen.h
+    class AlphaFeld;  //! AlphaField.h
+    class Rahmen;     //! Border.h
     class TextFeld;   //! from this file
     class VScrollBar; //! Scroll.h
     class HScrollBar; //! Scroll.h

Textur.cpp → Texture.cpp

@@ -1,6 +1,6 @@
-#include "Textur.h"
+#include "Texture.h"
 
-#include "Bild.h"
+#include "Image.h"
 #ifdef WIN32
 #    include <d3d11.h>
 #    include <d3d12.h>

Textur.h → Texture.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Punkt.h"
+#include "Point.h"
 #include "ReferenceCounter.h"
 
 struct ID3D11Texture2D;
@@ -10,9 +10,9 @@ struct ID3D11DeviceContext;
 
 namespace Framework
 {
-    class Bild;       //! Bild.h
+    class Bild;       //! Image.h
     class Render3D;   //! Render3D.h
-    class TexturList; //! TexturList.h
+    class TexturList; //! TextureList.h
     class DX12CopyCommandQueue;
     class DX12DirectCommandQueue;
 

Textur2D.cpp → Texture2D.cpp

@@ -1,11 +1,11 @@
-#include "Textur2D.h"
+#include "Texture2D.h"
 
 #include "Animation.h"
-#include "Bild.h"
+#include "Image.h"
 
 using namespace Framework;
 
-// Contents of the Textur2D class from Textur2D.h
+// Contents of the Textur2D class from Texture2D.h
 
 // Konstructor
 Textur2D::Textur2D()

TexturList.cpp → TextureList.cpp

@@ -1,7 +1,7 @@
-#include "TexturList.h"
+#include "TextureList.h"
 
 #include "Text.h"
-#include "Textur.h"
+#include "Texture.h"
 
 using namespace Framework;
 

TexturList.h → TextureList.h

@@ -5,7 +5,7 @@
 
 namespace Framework
 {
-    class Textur; //! Textur.h
+    class Textur; //! Texture.h
 
     //! Manages all loaded texture data so that multiple drawings can use
     //! the same data

TexturModel.cpp → TextureModel.cpp

@@ -1,11 +1,11 @@
-#include "TexturModel.h"
+#include "TextureModel.h"
 
 #include "DXBuffer.h"
 #include "Globals.h"
 #include "GraphicsApi.h"
 #include "Model3DList.h"
-#include "Textur.h"
-#include "TexturList.h"
+#include "Texture.h"
+#include "TextureList.h"
 
 using namespace Framework;
 

Zeit.cpp → Time.cpp

@@ -1,11 +1,11 @@
-#include "Zeit.h"
+#include "Time.h"
 
 #include <ctime>
 #include <time.h>
 
 #include "Text.h"
 #ifdef WIN32
-#    include "Fenster.h"
+#    include "Window.h"
 #else
 #    include <string.h>
 #    include <sys/time.h>
@@ -71,7 +71,7 @@ int gettimeofday(struct timeval* tv, struct timezone* tz)
 
 using namespace Framework;
 
-// Content of the Uhrzeit class from Zeit.h
+// Content of the Uhrzeit class from Time.h
 // Private
 int Uhrzeit::update() // calculates the new time
 {
@@ -587,7 +587,7 @@ bool Uhrzeit::istLater(const char* format, Text* zeit) const
     return ret;
 }
 
-// Content of the Datum class from Zeit.h
+// Content of the Datum class from Time.h
 // Private
 void Datum::update() // calculates the new date
 {
@@ -1126,7 +1126,7 @@ bool Datum::istLater(const char* format, Text* datum) const
     return ret;
 }
 
-// Content of the Zeit class from Zeit.h
+// Content of the Zeit class from Time.h
 // Constructor
 Zeit::Zeit()
     : ReferenceCounter(),
@@ -1829,7 +1829,7 @@ bool Zeit::istLater(const char* format, Text* zeit) const
     return ret;
 }
 
-// Content of the ZeitMesser class from Zeit.h
+// Content of the ZeitMesser class from Time.h
 // Constructor
 ZeitMesser::ZeitMesser()
     : ReferenceCounter(),

Zeit.h → Time.h

@@ -3,7 +3,7 @@
 
 #include <time.h>
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 #include "ReferenceCounter.h"
 
 namespace Framework

ToolTip.cpp

@@ -1,14 +1,14 @@
 #include "ToolTip.h"
 
-#include "AlphaFeld.h"
-#include "Bild.h"
-#include "Bildschirm.h"
-#include "MausEreignis.h"
-#include "Rahmen.h"
-#include "Schrift.h"
+#include "AlphaField.h"
+#include "Image.h"
+#include "Screen.h"
+#include "MouseEvent.h"
+#include "Border.h"
+#include "Font.h"
 #include "Scroll.h"
 #include "Text.h"
-#include "TextFeld.h"
+#include "TextField.h"
 
 using namespace Framework;
 

ToolTip.h

@@ -4,17 +4,17 @@
 #include <functional>
 
 #include "Array.h"
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
-    class Schrift;       //! Schrift.h
-    class Bild;          //! Bild.h
-    class AlphaFeld;     //! AlphaFeld.h
+    class Schrift;       //! Font.h
+    class Bild;          //! Image.h
+    class AlphaFeld;     //! AlphaField.h
     class Text;          //! Text.h
-    class Rahmen;        //! Rahmen.h
-    struct MausEreignis; //! MausEreignis.h
-    class Bildschirm;    //! Bildschirm.h
+    class Rahmen;        //! Border.h
+    struct MausEreignis; //! MouseEvent.h
+    class Bildschirm;    //! Screen.h
 
 #ifdef WIN32
 #    pragma vtordisp(push, 2)

DreieckListe.h → TriangleList.h

@@ -2,7 +2,7 @@
 #define DreieckListe_H
 
 #include "Array.h"
-#include "Punkt.h"
+#include "Point.h"
 
 namespace Framework
 {

UIDialog.cpp

@@ -1,8 +1,8 @@
 #include "UIDialog.h"
 
-#include "Knopf.h"
-#include "Schrift.h"
-#include "TextFeld.h"
+#include "Button.h"
+#include "Font.h"
+#include "TextField.h"
 #include "UIInitialization.h"
 
 using namespace Framework;

UIDialog.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Fenster.h"
+#include "Window.h"
 
 namespace Framework
 {

UIInitialization.cpp

@@ -1,19 +1,19 @@
 #include "UIInitialization.h"
 
 #include "Animation.h"
-#include "AuswahlBox.h"
-#include "Bild.h"
-#include "DateiSystem.h"
-#include "Diagramm.h"
-#include "Fenster.h"
-#include "Fortschritt.h"
-#include "Kamera2D.h"
-#include "Knopf.h"
-#include "Liste.h"
-#include "M2DVorschau.h"
+#include "SelectionBox.h"
+#include "Image.h"
+#include "FileSystem.h"
+#include "Diagram.h"
+#include "Window.h"
+#include "Progress.h"
+#include "Camera2D.h"
+#include "Button.h"
+#include "List.h"
+#include "M2DPreview.h"
 #include "Model2D.h"
-#include "Schrift.h"
-#include "Tabelle.h"
+#include "Font.h"
+#include "Table.h"
 #include "UIMLView.h"
 
 using namespace Framework;

UIInitialization.h

@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 
 namespace Framework
 {

UIMLView.cpp

@@ -1,15 +1,15 @@
 #include "UIMLView.h"
 
-#include "Bild.h"
-#include "Bildschirm.h"
-#include "Fenster.h"
-#include "Knopf.h"
-#include "Rahmen.h"
+#include "Image.h"
+#include "Screen.h"
+#include "Window.h"
+#include "Button.h"
+#include "Border.h"
 #include "RCPointer.h"
-#include "Schrift.h"
+#include "Font.h"
 #include "Scroll.h"
-#include "Tabelle.h"
-#include "TextFeld.h"
+#include "Table.h"
+#include "TextField.h"
 #include "XML.h"
 
 using namespace Framework;

UIMLView.h

@@ -4,7 +4,7 @@
 #include "Trie.h"
 #include "UIInitialization.h"
 #include "XML.h"
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {

Fenster.cpp → Window.cpp

@@ -1,23 +1,23 @@
-#include "Fenster.h"
+#include "Window.h"
 
-#include "AlphaFeld.h"
-#include "Bild.h"
-#include "Bildschirm.h"
+#include "AlphaField.h"
+#include "Image.h"
+#include "Screen.h"
 #include "Globals.h"
-#include "MausEreignis.h"
-#include "Rahmen.h"
+#include "MouseEvent.h"
+#include "Border.h"
 #include "Scroll.h"
-#include "TastaturEreignis.h"
+#include "KeyboardEvent.h"
 #include "Text.h"
-#include "TextFeld.h"
+#include "TextField.h"
 #include "ToolTip.h"
 #ifdef WIN32
-#    include "Maus.h"
+#    include "Mouse.h"
 #endif
 #include <iostream>
 
 #include "Logging.h"
-#include "Zeit.h"
+#include "Time.h"
 
 using namespace Framework;
 #ifdef WIN32
@@ -320,7 +320,7 @@ void Framework::CalculateEnteredString(
 #    endif // WIN32
 }
 
-// Contents of the WFenster class from Fenster.h
+// Contents of the WFenster class from Window.h
 // Constructor
 WFenster::WFenster()
     : ReferenceCounter(),
@@ -885,7 +885,7 @@ bool WFenster::istVerschiebbar()
     return verschiebbar;
 }
 
-// Contents of the WFensterArray class from Fenster.h
+// Contents of the WFensterArray class from Window.h
 // Constructor
 WFensterArray::WFensterArray()
     : next(0),
@@ -1030,7 +1030,7 @@ void Framework::WMessageBox(HWND hWnd, Text* titel, Text* meldung, UINT style)
 }
 #endif
 
-// Contents of the Fenster class from Fenster.h
+// Contents of the Fenster class from Window.h
 // Constructor
 Fenster::Fenster()
     : Zeichnung(),

Fenster.h → Window.h

@@ -2,19 +2,19 @@
 #define Fenster_H
 
 #include "Array.h"
-#include "Zeichnung.h"
+#include "Drawing.h"
 
 namespace Framework
 {
     class VScrollBar;    //! Scroll.h
     class HScrollBar;    //! Scroll.h
-    class TextFeld;      //! TextFeld.h
-    class Rahmen;        //! Rahmen.h
-    class Bildschirm;    //! Bildschirm.h
-    class AlphaFeld;     //! AlphaFeld.h
-    class Schrift;       //! Schrift.h
+    class TextFeld;      //! TextField.h
+    class Rahmen;        //! Border.h
+    class Bildschirm;    //! Screen.h
+    class AlphaFeld;     //! AlphaField.h
+    class Schrift;       //! Font.h
     class Text;          //! Text.h
-    class Bild;          //! Bild.h
+    class Bild;          //! Image.h
     class WFenster;      //! from this file
     class WFensterArray; //! from this file
     class Fenster;       //! from this file
@@ -144,7 +144,7 @@ namespace Framework
         //! Sets the callback function to be called on a mouse event.
         //! If the callback returns 0 or was not set, the mouse event is not
         //! further processed by the window. The standard function __ret1ME
-        //! can be used, defined in MausEreignis.h and always returns 1
+        //! can be used, defined in MouseEvent.h and always returns 1
         //! \param ak A pointer to the callback function
         DLLEXPORT void setMausAktion(MausAktion ak);
         //! Sets the callback function to be called before closing.
@@ -156,9 +156,9 @@ namespace Framework
         //! Sets the callback function to be called on a keyboard event.
         //! If the callback returns 0 or was not set, the keyboard event is not
         //! further processed. The standard function __ret1TE can be used,
-        //! defined in TastaturEreignis.h and always returns 1. Other standard
+        //! defined in KeyboardEvent.h and always returns 1. Other standard
         //! functions are _nurNummernTE and _nurHexTE also from
-        //! TastaturEreignis.h \param ak A pointer to the callback function
+        //! KeyboardEvent.h \param ak A pointer to the callback function
         DLLEXPORT void setTastaturAktion(TastaturAktion ak);
         //! Sets the handle to the window that should be managed by this class
         //! \param hwnd The handle

Welt2D.cpp → World2D.cpp

@@ -1,6 +1,6 @@
-#include "Welt2D.h"
+#include "World2D.h"
 
-#include "Bild.h"
+#include "Image.h"
 
 using namespace Framework;
 

Welt2D.h → World2D.h

@@ -5,7 +5,7 @@
 
 #include "Array.h"
 #include "Mat3.h"
-#include "Punkt.h"
+#include "Point.h"
 #include "Rect2.h"
 
 namespace Framework

Welt3D.cpp → World3D.cpp

@@ -1,15 +1,15 @@
-#include "Welt3D.h"
+#include "World3D.h"
 
 #include "DXBuffer.h"
 #include "Globals.h"
 #include "GraphicsApi.h"
-#include "MausEreignis.h"
+#include "MouseEvent.h"
 #include "Model3D.h"
-#include "Zeichnung3D.h"
+#include "Drawing3D.h"
 
 using namespace Framework;
 
-// Contents of the Welt3D class from Welt3D.h
+// Contents of the Welt3D class from World3D.h
 // Konstructor
 Welt3D::Welt3D()
     : Model3DCollection()

Welt3D.h → World3D.h

@@ -8,9 +8,9 @@
 
 namespace Framework
 {
-    class Zeichnung3D;     //! Zeichnung.h
+    class Zeichnung3D;     //! Drawing.h
     class Render3D;        //! Render3D.h
-    struct MausEreignis3D; //! MausEreignis.h
+    struct MausEreignis3D; //! MouseEvent.h
     class Model3D;
     class DXBuffer;
     class Welt3D;

Writer.h

@@ -1,8 +1,8 @@
-#pragma once
+#pragma once
 
 #include <iostream>
 
-#include "Betriebssystem.h"
+#include "OperatingSystem.h"
 
 namespace Framework
 {