Skip to content
This repository was archived by the owner on Feb 15, 2023. It is now read-only.

Commit 25ad607

Browse files
author
Erik McClure
committed
Fixup for public release, add readme
1 parent b075d0d commit 25ad607

Some content is hidden

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

46 files changed

+118
-46
lines changed

‎CHANGELOG.md

+4

‎Magnesium/Magnesium.rc

0 Bytes
Binary file not shown.

‎Magnesium/SCML.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __SCML_H__MG__

‎Magnesium/mgBox2D.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgBox2D.h"

‎Magnesium/mgComponent.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgComponent.h"

‎Magnesium/mgConsole.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22

33
#include "mgConsole.h"
44
#include "feathergui/fgElement.h"

‎Magnesium/mgControlMap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgControlMap.h"

‎Magnesium/mgEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgEngine.h"

‎Magnesium/mgEntity.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgComponent.h"

‎Magnesium/mgJoinPSB2.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgJoinPSB2.h"

‎Magnesium/mgLogic.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgLogic.h"

‎Magnesium/mgLua.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22

33
#include "mgLua.h"
44
#include "mgEngine.h"

‎Magnesium/mgPlaneshader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgPlaneshader.h"

‎Magnesium/mgRefCounter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgRefCounter.h"

‎Magnesium/mgSystem.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgSystemManager.h"

‎Magnesium/mgSystemManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgSystemManager.h"

‎Magnesium/mgTinyOAL.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#include "mgTinyOAL.h"

‎README.md

+11

‎examples/LD34/LD34.rc

-2.67 KB
Binary file not shown.

‎examples/LD34/LD34.vcxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<SubSystem>Windows</SubSystem>
107107
<GenerateDebugInformation>true</GenerateDebugInformation>
108108
<AdditionalLibraryDirectories>../../lib</AdditionalLibraryDirectories>
109-
<AdditionalDependencies>magnesium32_d.lib;bss-util32_d.lib;planeshader32_d.lib;tinyoal32_d.lib;feathergui32_d.lib;Box2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
109+
<AdditionalDependencies>magnesium32_d.lib;bss-util32_d.lib;planeshader32_d.lib;tinyoal32_d.lib;feathergui32_d.lib;Box2D.lib;lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
110110
</Link>
111111
</ItemDefinitionGroup>
112112
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -150,7 +150,7 @@
150150
<OptimizeReferences>true</OptimizeReferences>
151151
<GenerateDebugInformation>true</GenerateDebugInformation>
152152
<AdditionalLibraryDirectories>../../lib</AdditionalLibraryDirectories>
153-
<AdditionalDependencies>magnesium32.lib;bss-util32.lib;planeshader32.lib;tinyoal32.lib;feathergui32.lib;Box2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
153+
<AdditionalDependencies>magnesium32.lib;bss-util32.lib;planeshader32.lib;tinyoal32.lib;feathergui32.lib;Box2D.lib;lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
154154
</Link>
155155
</ItemDefinitionGroup>
156156
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,10 +183,10 @@
183183
<ClCompile Include="main.cpp" />
184184
</ItemGroup>
185185
<ItemGroup>
186-
<ResourceCompile Include="LD34.rc" />
186+
<ClInclude Include="ld34.h" />
187187
</ItemGroup>
188188
<ItemGroup>
189-
<ClInclude Include="ld34.h" />
189+
<ResourceCompile Include="..\blank.rc" />
190190
</ItemGroup>
191191
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
192192
<ImportGroup Label="ExtensionTargets">

‎examples/LD34/LD34.vcxproj.filters

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
2121
</ItemGroup>
22-
<ItemGroup>
23-
<ResourceCompile Include="LD34.rc">
24-
<Filter>Resource Files</Filter>
25-
</ResourceCompile>
26-
</ItemGroup>
2722
<ItemGroup>
2823
<ClInclude Include="ld34.h">
2924
<Filter>Header Files</Filter>
3025
</ClInclude>
3126
</ItemGroup>
27+
<ItemGroup>
28+
<ResourceCompile Include="..\blank.rc">
29+
<Filter>Resource Files</Filter>
30+
</ResourceCompile>
31+
</ItemGroup>
3232
</Project>

‎examples/LD34/ld34.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2016 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __DEC_H__LD__

‎examples/LD34/main.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* LD34
22
*
3-
* Copyright ©2016 Black Sphere Studios
3+
* Copyright ©2018 Black Sphere Studios
4+
* For conditions of distribution and use, see copyright notice in Magnesium.h
45
*/
56

67
#include "Magnesium.h"

‎examples/Testbed/Testbed.vcxproj

+3
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,9 @@
342342
<ItemGroup>
343343
<ClCompile Include="testbed.cpp" />
344344
</ItemGroup>
345+
<ItemGroup>
346+
<ResourceCompile Include="..\blank.rc" />
347+
</ItemGroup>
345348
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
346349
<ImportGroup Label="ExtensionTargets">
347350
</ImportGroup>

‎examples/Testbed/Testbed.vcxproj.filters

+5
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,9 @@
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
2121
</ItemGroup>
22+
<ItemGroup>
23+
<ResourceCompile Include="..\blank.rc">
24+
<Filter>Resource Files</Filter>
25+
</ResourceCompile>
26+
</ItemGroup>
2227
</Project>

‎examples/Testbed/testbed.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* This example runs a series of tests to ensure Magnesium is
44
* working correctly
55
*
6-
* Copyright ©2016 Black Sphere Studios
6+
* Copyright ©2018 Black Sphere Studios
7+
* For conditions of distribution and use, see copyright notice in Magnesium.h
78
*/
89

910
#include "magnesium/mgEngine.h"

‎examples/blank.rc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
101 ICON "..\\magnesium.ico"

‎examples/magnesium.ico

98.3 KB
Binary file not shown.

‎include/magnesium/Magnesium.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
/* Magnesium Game Engine
2-
Copyright ©2017 Black Sphere Studios
2+
Copyright ©2018 Black Sphere Studios
33
4-
Proprietary license. This code may not be distributed or modified in any way.
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
515
*/
616

717
#ifndef __MAGNESIUM_H__MG__

‎include/magnesium/mgBox2D.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __BOX2D_H__MG__

‎include/magnesium/mgComponent.h

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __COMPONENT_H__MG__
@@ -37,7 +37,13 @@ namespace magnesium {
3737
inline void deallocate(T* p, size_t sz = 0) noexcept { mgComponentStoreBase::dllfree(p); }
3838
};
3939

40-
struct EntityIterator : public std::iterator<std::bidirectional_iterator_tag, mgEntity*> {
40+
struct EntityIterator {
41+
using iterator_category = std::bidirectional_iterator_tag;
42+
using value_type = mgEntity*;
43+
using difference_type = ptrdiff_t;
44+
using pointer = mgEntity*;
45+
using reference = mgEntity*;
46+
4147
inline EntityIterator(void* p_, size_t len_, size_t type_) : p(reinterpret_cast<uint8_t*>(p_)), end(reinterpret_cast<uint8_t*>(p_) + (len_*type_)), type(type_) {}
4248
inline mgEntity* operator*() const { return *reinterpret_cast<mgEntity**>(p); }
4349
inline EntityIterator& operator++() { p += type; return *this; } //prefix

‎include/magnesium/mgConsole.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __CONSOLE_H__MG__

‎include/magnesium/mgControlMap.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __CONTROL_MAP_H__MG__

‎include/magnesium/mgEngine.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __ENGINE_H__MG__

‎include/magnesium/mgEntity.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __ENTITY_H__MG__

‎include/magnesium/mgJoinPSB2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __JOIN_PS_B2_H__MG__

‎include/magnesium/mgLogic.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __LOGIC_H__MG__

‎include/magnesium/mgLua.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __LUA_H__MG__

‎include/magnesium/mgPlaneshader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __PLANESHADER_H__MG__

‎include/magnesium/mgRefCounter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __REF_COUNTER_H__MG__

‎include/magnesium/mgSystem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __SYSTEM_H__MG__

‎include/magnesium/mgSystemManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __SYSTEM_MANAGER_H__MG__

‎include/magnesium/mgTimeline.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __TIMELINE_H__MG__

‎include/magnesium/mgTinyOAL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __TINYOAL_H__MG__

‎include/magnesium/mg_dec.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright ©2017 Black Sphere Studios
1+
// Copyright ©2018 Black Sphere Studios
22
// For conditions of distribution and use, see copyright notice in Magnesium.h
33

44
#ifndef __DEC_H__MG__

‎pack.bat

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
@ECHO OFF
2+
md "..\Packages\Magnesium"
3+
4+
RMDIR /S /Q ".\Debug\"
5+
RMDIR /S /Q ".\Release\"
6+
RMDIR /S /Q ".\x64\"
7+
RMDIR /S /Q ".\Win32\"
8+
RMDIR /S /Q ".\examples\x64\"
9+
RMDIR /S /Q ".\examples\Win32\"
10+
RMDIR /S /Q ".\examples\LD34\x64\"
11+
RMDIR /S /Q ".\examples\LD34\Win32\"
12+
RMDIR /S /Q ".\examples\Testbed\x64\"
13+
RMDIR /S /Q ".\examples\Testbed\Win32\"
14+
RMDIR /S /Q ".\Magnesium\x64\"
15+
RMDIR /S /Q ".\Magnesium\Win32\"
16+
DEL /F /S /Q *.log *.exp *.idb *.ilk *.iobj *.ipdb *.metagen *.pch
17+
DEL /F /Q ".\bin\Testbed*.lib"
18+
DEL /F /Q ".\bin32\Testbed*.lib"
19+
DEL /F /Q ".\bin\Testbed*.pdb"
20+
DEL /F /Q ".\bin32\Testbed*.pdb"
21+
DEL /F /Q ".\bin\LD34*.lib"
22+
DEL /F /Q ".\bin32\LD34*.lib"
23+
DEL /F /Q ".\bin\LD34*.pdb"
24+
DEL /F /Q ".\bin32\LD34*.pdb"
25+
XCOPY *.* "..\Packages\Magnesium" /S /C /I /R /Y
26+
DEL /F /Q "..\Packages\Magnesium\bin\D3D*.dll"
27+
DEL /F /Q "..\Packages\Magnesium\bin\D3D*.pdb"
28+
DEL /F /Q "..\Packages\Magnesium\bin32\D3D*.dll"
29+
DEL /F /Q "..\Packages\Magnesium\bin32\D3D*.pdb"
30+
DEL /F /S /Q "..\Packages\Magnesium\*.zip"

0 commit comments

Comments
 (0)