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

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Perchik71 committed Jun 1, 2021
2 parents c52e239 + 766945c commit 604a4da
Show file tree
Hide file tree
Showing 17 changed files with 408 additions and 11 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,9 @@ fallout4_test/resource.aps
Dependencies/libdeflate.vcxproj.user
Dependencies/libdeflate.vcxproj
Dependencies/tbb
Dependencies/json
*.lnk

# other
*.cer
*.bat
14 changes: 10 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
path = Dependencies/meshoptimizer
url = https://github.com/zeux/meshoptimizer.git
branch = master
[submodule "Dependencies/tbb"]
path = Dependencies/tbb
url = https://github.com/01org/tbb.git
branch = tbb_2019
[submodule "Dependencies/libdeflate"]
path = Dependencies/libdeflate
url = https://github.com/ebiggers/libdeflate.git
Expand All @@ -15,3 +11,13 @@
[submodule "Perchik71"]
path = Dependencies/mINI
url = https://github.com/Perchik71/mINI
[submodule "Dependencies/json"]
path = Dependencies/json
url = https://github.com/nlohmann/json.git
[submodule "Dependencies/tbb"]
path = Dependencies/tbb
url = https://github.com/oneapi-src/oneTBB.git
branch = tbb_2020
[submodule "Dependencies/zipper"]
path = Dependencies/zipper
url = https://github.com/kuba--/zip.git
1 change: 1 addition & 0 deletions Dependencies/json
Submodule json added at e10a3f
2 changes: 1 addition & 1 deletion Dependencies/tbb
Submodule tbb updated from a803f2 to eca91f
1 change: 1 addition & 0 deletions Dependencies/zipper
Submodule zipper added at f02a47
12 changes: 12 additions & 0 deletions Resources/dialogs/1221-8.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "Habrahabr",
"nothing": null,
"answer": {
"everything": 42
},
"companies": ["Infopulse", "TM"],
"user": {
"name": "tangro",
"active": true
}
}
5 changes: 5 additions & 0 deletions fallout4_test/fallout4_test.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\Dependencies\zipper\src\miniz.h" />
<ClInclude Include="..\Dependencies\zipper\src\zip.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="src\config.h" />
<ClInclude Include="src\erase_if.h" />
Expand All @@ -173,6 +175,7 @@
<ClInclude Include="src\patches\CKF4\DataWindow.h" />
<ClInclude Include="src\patches\CKF4\Editor.h" />
<ClInclude Include="src\patches\CKF4\EditorUI.h" />
<ClInclude Include="src\patches\CKF4\JsonDialogGenerator.h" />
<ClInclude Include="src\patches\CKF4\PreferencesWindow.h" />
<ClInclude Include="src\patches\CKF4\ShowHideWindow.h" />
<ClInclude Include="src\patches\CKF4\TESCellViewScene_CK.h" />
Expand Down Expand Up @@ -258,12 +261,14 @@
<ClInclude Include="src\xutil.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Dependencies\zipper\src\zip.c" />
<ClCompile Include="src\INIReader.cpp" />
<ClCompile Include="src\patches\bnet.cpp" />
<ClCompile Include="src\patches\CKF4\ActorWindow.cpp" />
<ClCompile Include="src\patches\CKF4\CellViewWindow.cpp" />
<ClCompile Include="src\patches\CKF4\DataWindow.cpp" />
<ClCompile Include="src\patches\CKF4\Editor.cpp" />
<ClCompile Include="src\patches\CKF4\JsonDialogGenerator.cpp" />
<ClCompile Include="src\patches\CKF4\PreferencesWindow.cpp" />
<ClCompile Include="src\patches\CKF4\EditorUIProgressDialog.cpp" />
<ClCompile Include="src\patches\CKF4\ExperimentalNuukem.cpp" />
Expand Down
21 changes: 21 additions & 0 deletions fallout4_test/fallout4_test.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@
<Filter Include="Source Files\UI\Theme">
<UniqueIdentifier>{15465807-fb72-43fe-a815-6fe39cdff7e4}</UniqueIdentifier>
</Filter>
<Filter Include="__dependencies">
<UniqueIdentifier>{81995caa-f5d0-49b7-965d-68c1333396e6}</UniqueIdentifier>
</Filter>
<Filter Include="__dependencies\zipper">
<UniqueIdentifier>{966ff70e-c235-430f-9b45-98e040be03f6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\profiler.h">
Expand Down Expand Up @@ -359,6 +365,15 @@
<ClInclude Include="src\patches\CKF4\ActorWindow.h">
<Filter>Header Files\UI\Windows</Filter>
</ClInclude>
<ClInclude Include="src\patches\CKF4\JsonDialogGenerator.h">
<Filter>Header Files\UI\Classes</Filter>
</ClInclude>
<ClInclude Include="..\Dependencies\zipper\src\zip.h">
<Filter>__dependencies\zipper</Filter>
</ClInclude>
<ClInclude Include="..\Dependencies\zipper\src\miniz.h">
<Filter>__dependencies\zipper</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\dllmain.cpp">
Expand Down Expand Up @@ -589,6 +604,12 @@
<ClCompile Include="src\patches\CKF4\ActorWindow.cpp">
<Filter>Source Files\UI\Windows</Filter>
</ClCompile>
<ClCompile Include="src\patches\CKF4\JsonDialogGenerator.cpp">
<Filter>Source Files\UI\Classes</Filter>
</ClCompile>
<ClCompile Include="..\Dependencies\zipper\src\zip.c">
<Filter>__dependencies\zipper</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="src\typeinfo\ni_rtti.inl">
Expand Down
Binary file modified fallout4_test/resource.rc
Binary file not shown.
4 changes: 2 additions & 2 deletions fallout4_test/src/patches/CKF4/Editor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ uint32_t FIXAPI sub_1405B31C0_SSE41(BSTArray<LPVOID>& Array, LPCVOID &Target)

for (uint32_t iter = 0; iter < vectorizedIterations; iter++)
{
__m128i test1 = _mm_cmpeq_epi64(targets, _mm_loadu_si128((__m128i *)&data[index + 0]));
__m128i test2 = _mm_cmpeq_epi64(targets, _mm_loadu_si128((__m128i *)&data[index + 2]));
__m128i test1 = _mm_cmpeq_epi64(targets, _mm_loadu_si128((__m128i*)&data[index + 0]));
__m128i test2 = _mm_cmpeq_epi64(targets, _mm_loadu_si128((__m128i*)&data[index + 2]));

INT32 mask = _mm_movemask_pd(_mm_castsi128_pd(_mm_or_si128(test1, test2)));

Expand Down
Loading

0 comments on commit 604a4da

Please sign in to comment.