Skip to content

Commit 5f302ca

Browse files
zhangdoazhangdoa
committed
Rename Project
1 parent 4a66ebb commit 5f302ca

134 files changed

Lines changed: 38216 additions & 38213 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎InnocenceEngine 1.0/source/memoryDump.innoDump‎

-5.13 KB
Binary file not shown.

InnocenceEngine C++.sln renamed to InnocenceEngine.sln

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27004.2009
5-
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InnocenceEngine 1.0", "InnocenceEngine 1.0\source\InnocenceEngine 1.0.vcxproj", "{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}"
7-
EndProject
8-
Global
9-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|Any CPU = Debug|Any CPU
11-
Debug|Win32 = Debug|Win32
12-
Debug|x64 = Debug|x64
13-
Debug|x86 = Debug|x86
14-
Release|Any CPU = Release|Any CPU
15-
Release|Win32 = Release|Win32
16-
Release|x64 = Release|x64
17-
Release|x86 = Release|x86
18-
EndGlobalSection
19-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|Any CPU.ActiveCfg = Debug|Win32
21-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|Win32.ActiveCfg = Debug|Win32
22-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|Win32.Build.0 = Debug|Win32
23-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|x64.ActiveCfg = Debug|x64
24-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|x64.Build.0 = Debug|x64
25-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|x86.ActiveCfg = Debug|Win32
26-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|x86.Build.0 = Debug|Win32
27-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|Any CPU.ActiveCfg = Release|Win32
28-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|Win32.ActiveCfg = Release|Win32
29-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|Win32.Build.0 = Release|Win32
30-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|x64.ActiveCfg = Release|x64
31-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|x64.Build.0 = Release|x64
32-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|x86.ActiveCfg = Release|Win32
33-
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|x86.Build.0 = Release|Win32
34-
EndGlobalSection
35-
GlobalSection(SolutionProperties) = preSolution
36-
HideSolutionNode = FALSE
37-
EndGlobalSection
38-
GlobalSection(ExtensibilityGlobals) = postSolution
39-
SolutionGuid = {36234C4C-54E8-426D-A7B9-1275D7552BE7}
40-
EndGlobalSection
41-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27004.2009
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InnocenceEngine", "InnocenceEngine\source\InnocenceEngine.vcxproj", "{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Debug|Win32 = Debug|Win32
12+
Debug|x64 = Debug|x64
13+
Debug|x86 = Debug|x86
14+
Release|Any CPU = Release|Any CPU
15+
Release|Win32 = Release|Win32
16+
Release|x64 = Release|x64
17+
Release|x86 = Release|x86
18+
EndGlobalSection
19+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|Any CPU.ActiveCfg = Debug|Win32
21+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|Win32.ActiveCfg = Debug|Win32
22+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|Win32.Build.0 = Debug|Win32
23+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|x64.ActiveCfg = Debug|x64
24+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|x64.Build.0 = Debug|x64
25+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|x86.ActiveCfg = Debug|Win32
26+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Debug|x86.Build.0 = Debug|Win32
27+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|Any CPU.ActiveCfg = Release|Win32
28+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|Win32.ActiveCfg = Release|Win32
29+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|Win32.Build.0 = Release|Win32
30+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|x64.ActiveCfg = Release|x64
31+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|x64.Build.0 = Release|x64
32+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|x86.ActiveCfg = Release|Win32
33+
{2A8E700B-FC5B-4F53-8D75-89AA1DB94DA3}.Release|x86.Build.0 = Release|Win32
34+
EndGlobalSection
35+
GlobalSection(SolutionProperties) = preSolution
36+
HideSolutionNode = FALSE
37+
EndGlobalSection
38+
GlobalSection(ExtensibilityGlobals) = postSolution
39+
SolutionGuid = {36234C4C-54E8-426D-A7B9-1275D7552BE7}
40+
EndGlobalSection
41+
EndGlobal

InnocenceEngine 1.0/source/InnocenceEngine 1.0.rc renamed to InnocenceEngine/source/InnocenceEngine.rc

File renamed without changes.

InnocenceEngine 1.0/source/InnocenceEngine 1.0.vcxproj renamed to InnocenceEngine/source/InnocenceEngine.vcxproj

Lines changed: 227 additions & 224 deletions
Large diffs are not rendered by default.

InnocenceEngine 1.0/source/InnocenceEngine 1.0.vcxproj.filters renamed to InnocenceEngine/source/InnocenceEngine.vcxproj.filters

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,81 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup>
4-
<Filter Include="Resource Files">
5-
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
6-
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
7-
</Filter>
8-
</ItemGroup>
9-
<ItemGroup>
10-
<ResourceCompile Include="InnocenceEngine 1.0.rc">
11-
<Filter>Resource Files</Filter>
12-
</ResourceCompile>
13-
</ItemGroup>
14-
<ItemGroup>
15-
<ClCompile Include="code\core\component\CameraComponent.cpp" />
16-
<ClCompile Include="code\core\interface\IGameData.cpp" />
17-
<ClCompile Include="code\core\manager\AssetManager.cpp" />
18-
<ClCompile Include="code\core\manager\CoreManager.cpp" />
19-
<ClCompile Include="code\core\manager\LogManager.cpp" />
20-
<ClCompile Include="code\core\manager\TimeManager.cpp" />
21-
<ClCompile Include="code\game\InnocenceGarden.cpp" />
22-
<ClCompile Include="code\main\InnocenceEngine 1.0.cpp" />
23-
<ClCompile Include="code\main\stdafx.cpp" />
24-
<ClCompile Include="code\core\component\InputComponent.cpp" />
25-
<ClCompile Include="code\game\PlayerCharacter.cpp" />
26-
<ClCompile Include="code\core\manager\graphic\RenderingManager.cpp" />
27-
<ClCompile Include="code\core\manager\graphic\SceneGraphManager.cpp" />
28-
<ClCompile Include="code\core\manager\graphic\GLWindowManager.cpp" />
29-
<ClCompile Include="code\core\manager\graphic\GLInputManager.cpp" />
30-
<ClCompile Include="code\core\component\VisibleComponent.cpp" />
31-
<ClCompile Include="code\core\component\LightComponent.cpp" />
32-
<ClCompile Include="code\core\third-party\glad.c" />
33-
<ClCompile Include="code\core\data\InnoMath.cpp" />
34-
<ClCompile Include="code\core\manager\TaskManager.cpp" />
35-
<ClCompile Include="code\core\data\InnoTask.cpp" />
36-
<ClCompile Include="code\core\manager\MemoryManager.cpp" />
37-
<ClCompile Include="code\core\interface\BaseEntity.cpp" />
38-
<ClCompile Include="code\core\interface\IEntity.cpp" />
39-
<ClCompile Include="code\core\interface\IObject.cpp" />
40-
<ClCompile Include="code\core\interface\IManager.cpp" />
41-
<ClCompile Include="code\core\interface\IShader.cpp" />
42-
<ClCompile Include="code\core\manager\graphic\GLRenderingManager.cpp" />
43-
<ClCompile Include="code\core\interface\IGraphicPrimitive.cpp" />
44-
<ClCompile Include="code\core\data\GLGraphicPrimitive.cpp" />
45-
<ClCompile Include="code\game\TestCase.cpp" />
46-
</ItemGroup>
47-
<ItemGroup>
48-
<ClInclude Include="code\core\component\CameraComponent.h" />
49-
<ClInclude Include="code\core\interface\IGameData.h" />
50-
<ClInclude Include="code\core\manager\AssetManager.h" />
51-
<ClInclude Include="code\core\manager\CoreManager.h" />
52-
<ClInclude Include="code\core\manager\LogManager.h" />
53-
<ClInclude Include="code\core\manager\TimeManager.h" />
54-
<ClInclude Include="code\core\third-party\stb_image.h" />
55-
<ClInclude Include="code\game\InnocenceGarden.h" />
56-
<ClInclude Include="code\main\resource.h" />
57-
<ClInclude Include="code\main\stdafx.h" />
58-
<ClInclude Include="code\main\targetver.h" />
59-
<ClInclude Include="code\core\component\InputComponent.h" />
60-
<ClInclude Include="code\game\PlayerCharacter.h" />
61-
<ClInclude Include="code\core\manager\graphic\RenderingManager.h" />
62-
<ClInclude Include="code\core\manager\graphic\SceneGraphManager.h" />
63-
<ClInclude Include="code\core\manager\graphic\GLWindowManager.h" />
64-
<ClInclude Include="code\core\manager\graphic\GLInputManager.h" />
65-
<ClInclude Include="code\core\component\VisibleComponent.h" />
66-
<ClInclude Include="code\core\component\LightComponent.h" />
67-
<ClInclude Include="code\core\data\InnoMath.h" />
68-
<ClInclude Include="code\core\manager\TaskManager.h" />
69-
<ClInclude Include="code\core\data\InnoTask.h" />
70-
<ClInclude Include="code\core\interface\BaseEntity.h" />
71-
<ClInclude Include="code\core\interface\IEntity.h" />
72-
<ClInclude Include="code\core\interface\IObject.h" />
73-
<ClInclude Include="code\core\interface\IManager.h" />
74-
<ClInclude Include="code\core\interface\IShader.h" />
75-
<ClInclude Include="code\core\manager\graphic\GLRenderingManager.h" />
76-
<ClInclude Include="code\core\interface\IGraphicPrimitive.h" />
77-
<ClInclude Include="code\core\data\GLGraphicPrimitive.h" />
78-
<ClInclude Include="code\core\manager\MemoryManager.hpp" />
79-
<ClInclude Include="code\game\TestCase.h" />
80-
</ItemGroup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Resource Files">
5+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
6+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
7+
</Filter>
8+
</ItemGroup>
9+
<ItemGroup>
10+
<ResourceCompile Include="InnocenceEngine 1.0.rc">
11+
<Filter>Resource Files</Filter>
12+
</ResourceCompile>
13+
</ItemGroup>
14+
<ItemGroup>
15+
<ClCompile Include="code\core\component\CameraComponent.cpp" />
16+
<ClCompile Include="code\core\interface\IGameData.cpp" />
17+
<ClCompile Include="code\core\manager\AssetManager.cpp" />
18+
<ClCompile Include="code\core\manager\CoreManager.cpp" />
19+
<ClCompile Include="code\core\manager\LogManager.cpp" />
20+
<ClCompile Include="code\core\manager\TimeManager.cpp" />
21+
<ClCompile Include="code\game\InnocenceGarden.cpp" />
22+
<ClCompile Include="code\main\InnocenceEngine 1.0.cpp" />
23+
<ClCompile Include="code\main\stdafx.cpp" />
24+
<ClCompile Include="code\core\component\InputComponent.cpp" />
25+
<ClCompile Include="code\game\PlayerCharacter.cpp" />
26+
<ClCompile Include="code\core\manager\graphic\RenderingManager.cpp" />
27+
<ClCompile Include="code\core\manager\graphic\SceneGraphManager.cpp" />
28+
<ClCompile Include="code\core\manager\graphic\GLWindowManager.cpp" />
29+
<ClCompile Include="code\core\manager\graphic\GLInputManager.cpp" />
30+
<ClCompile Include="code\core\component\VisibleComponent.cpp" />
31+
<ClCompile Include="code\core\component\LightComponent.cpp" />
32+
<ClCompile Include="code\core\third-party\glad.c" />
33+
<ClCompile Include="code\core\data\InnoMath.cpp" />
34+
<ClCompile Include="code\core\manager\TaskManager.cpp" />
35+
<ClCompile Include="code\core\data\InnoTask.cpp" />
36+
<ClCompile Include="code\core\manager\MemoryManager.cpp" />
37+
<ClCompile Include="code\core\interface\BaseEntity.cpp" />
38+
<ClCompile Include="code\core\interface\IEntity.cpp" />
39+
<ClCompile Include="code\core\interface\IObject.cpp" />
40+
<ClCompile Include="code\core\interface\IManager.cpp" />
41+
<ClCompile Include="code\core\interface\IShader.cpp" />
42+
<ClCompile Include="code\core\manager\graphic\GLRenderingManager.cpp" />
43+
<ClCompile Include="code\core\interface\IGraphicPrimitive.cpp" />
44+
<ClCompile Include="code\core\data\GLGraphicPrimitive.cpp" />
45+
<ClCompile Include="code\game\TestCase.cpp" />
46+
</ItemGroup>
47+
<ItemGroup>
48+
<ClInclude Include="code\core\component\CameraComponent.h" />
49+
<ClInclude Include="code\core\interface\IGameData.h" />
50+
<ClInclude Include="code\core\manager\AssetManager.h" />
51+
<ClInclude Include="code\core\manager\CoreManager.h" />
52+
<ClInclude Include="code\core\manager\LogManager.h" />
53+
<ClInclude Include="code\core\manager\TimeManager.h" />
54+
<ClInclude Include="code\core\third-party\stb_image.h" />
55+
<ClInclude Include="code\game\InnocenceGarden.h" />
56+
<ClInclude Include="code\main\resource.h" />
57+
<ClInclude Include="code\main\stdafx.h" />
58+
<ClInclude Include="code\main\targetver.h" />
59+
<ClInclude Include="code\core\component\InputComponent.h" />
60+
<ClInclude Include="code\game\PlayerCharacter.h" />
61+
<ClInclude Include="code\core\manager\graphic\RenderingManager.h" />
62+
<ClInclude Include="code\core\manager\graphic\SceneGraphManager.h" />
63+
<ClInclude Include="code\core\manager\graphic\GLWindowManager.h" />
64+
<ClInclude Include="code\core\manager\graphic\GLInputManager.h" />
65+
<ClInclude Include="code\core\component\VisibleComponent.h" />
66+
<ClInclude Include="code\core\component\LightComponent.h" />
67+
<ClInclude Include="code\core\data\InnoMath.h" />
68+
<ClInclude Include="code\core\manager\TaskManager.h" />
69+
<ClInclude Include="code\core\data\InnoTask.h" />
70+
<ClInclude Include="code\core\interface\BaseEntity.h" />
71+
<ClInclude Include="code\core\interface\IEntity.h" />
72+
<ClInclude Include="code\core\interface\IObject.h" />
73+
<ClInclude Include="code\core\interface\IManager.h" />
74+
<ClInclude Include="code\core\interface\IShader.h" />
75+
<ClInclude Include="code\core\manager\graphic\GLRenderingManager.h" />
76+
<ClInclude Include="code\core\interface\IGraphicPrimitive.h" />
77+
<ClInclude Include="code\core\data\GLGraphicPrimitive.h" />
78+
<ClInclude Include="code\core\manager\MemoryManager.hpp" />
79+
<ClInclude Include="code\game\TestCase.h" />
80+
</ItemGroup>
8181
</Project>

InnocenceEngine 1.0/source/code/core/component/CameraComponent.cpp renamed to InnocenceEngine/source/code/core/component/CameraComponent.cpp

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
#include "../../main/stdafx.h"
2-
#include "CameraComponent.h"
3-
4-
CameraComponent::CameraComponent()
5-
{
6-
}
7-
8-
CameraComponent::~CameraComponent()
9-
{
10-
}
11-
12-
mat4 CameraComponent::getPosMatrix() const
13-
{
14-
return getParentActor()->caclWorldPos().mul(-1.0f).toTranslationMartix();
15-
}
16-
17-
mat4 CameraComponent::getRotMatrix() const
18-
{
19-
// quaternion rotation
20-
quat conjugateRotQuat = getParentActor()->caclWorldRot();
21-
conjugateRotQuat.x = -conjugateRotQuat.x;
22-
conjugateRotQuat.y = -conjugateRotQuat.y;
23-
conjugateRotQuat.z = -conjugateRotQuat.z;
24-
25-
return conjugateRotQuat.toRotationMartix();
26-
}
27-
28-
mat4 CameraComponent::getProjectionMatrix() const
29-
{
30-
return m_projectionMatrix;
31-
}
32-
33-
void CameraComponent::setup()
34-
{
35-
IEntity::setup();
36-
}
37-
38-
void CameraComponent::initialize()
39-
{
40-
m_projectionMatrix.initializeToPerspectiveMatrix((70.0f / 180.0f) * PI, (16.0f / 9.0f), 0.1f, 1000000.0f);
41-
}
42-
43-
void CameraComponent::update()
44-
{
45-
}
46-
47-
void CameraComponent::shutdown()
48-
{
49-
}
50-
1+
#include "../../main/stdafx.h"
2+
#include "CameraComponent.h"
3+
4+
CameraComponent::CameraComponent()
5+
{
6+
}
7+
8+
CameraComponent::~CameraComponent()
9+
{
10+
}
11+
12+
mat4 CameraComponent::getPosMatrix() const
13+
{
14+
return getParentActor()->caclWorldPos().mul(-1.0f).toTranslationMartix();
15+
}
16+
17+
mat4 CameraComponent::getRotMatrix() const
18+
{
19+
// quaternion rotation
20+
quat conjugateRotQuat = getParentActor()->caclWorldRot();
21+
conjugateRotQuat.x = -conjugateRotQuat.x;
22+
conjugateRotQuat.y = -conjugateRotQuat.y;
23+
conjugateRotQuat.z = -conjugateRotQuat.z;
24+
25+
return conjugateRotQuat.toRotationMartix();
26+
}
27+
28+
mat4 CameraComponent::getProjectionMatrix() const
29+
{
30+
return m_projectionMatrix;
31+
}
32+
33+
void CameraComponent::setup()
34+
{
35+
IEntity::setup();
36+
}
37+
38+
void CameraComponent::initialize()
39+
{
40+
m_projectionMatrix.initializeToPerspectiveMatrix((70.0f / 180.0f) * PI, (16.0f / 9.0f), 0.1f, 1000000.0f);
41+
}
42+
43+
void CameraComponent::update()
44+
{
45+
}
46+
47+
void CameraComponent::shutdown()
48+
{
49+
}
50+

InnocenceEngine 1.0/source/code/core/component/CameraComponent.h renamed to InnocenceEngine/source/code/core/component/CameraComponent.h

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
#pragma once
2-
#include "../interface/BaseEntity.h"
3-
4-
class CameraComponent : public BaseComponent
5-
{
6-
public:
7-
CameraComponent();
8-
~CameraComponent();
9-
10-
void setup() override;
11-
void initialize() override;
12-
void update() override;
13-
void shutdown() override;
14-
15-
mat4 getPosMatrix() const;
16-
mat4 getRotMatrix() const;
17-
mat4 getProjectionMatrix() const;
18-
19-
private:
20-
mat4 m_projectionMatrix;
21-
};
1+
#pragma once
2+
#include "../interface/BaseEntity.h"
3+
4+
class CameraComponent : public BaseComponent
5+
{
6+
public:
7+
CameraComponent();
8+
~CameraComponent();
9+
10+
void setup() override;
11+
void initialize() override;
12+
void update() override;
13+
void shutdown() override;
14+
15+
mat4 getPosMatrix() const;
16+
mat4 getRotMatrix() const;
17+
mat4 getProjectionMatrix() const;
18+
19+
private:
20+
mat4 m_projectionMatrix;
21+
};

0 commit comments

Comments
 (0)