Skip to content
Permalink
Browse files

Nested folders in Windows

  • Loading branch information...
Apoorva Joshi
Apoorva Joshi committed Apr 8, 2016
1 parent 97ff499 commit 587f1351227daf767896494157fdc950c673a26d
@@ -146,32 +146,33 @@
<Image Include="..\..\img\papaya.ico" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\glew\glew.c" />
<ClCompile Include="..\..\src\imgui\imgui.cpp" />
<ClCompile Include="..\..\src\core\picker.cpp" />
<ClCompile Include="..\..\src\core\prefs.cpp" />
<ClCompile Include="..\..\src\libs\glew\glew.cpp" />
<ClCompile Include="..\..\src\libs\imgui\imgui.cpp" />
<ClCompile Include="..\..\src\libs\single_header_libs.cpp" />
<ClCompile Include="..\..\src\papaya_core.cpp" />
<ClCompile Include="..\..\src\papaya_platform_win32.cpp" />
<ClCompile Include="..\..\src\picker.cpp" />
<ClCompile Include="..\..\src\prefs.cpp" />
<ClCompile Include="..\..\src\single_libs.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\easytab.h" />
<ClInclude Include="..\..\src\gl.h" />
<ClInclude Include="..\..\src\glew\glew.h" />
<ClInclude Include="..\..\src\glew\wglew.h" />
<ClInclude Include="..\..\src\imgui\imgui.h" />
<ClInclude Include="..\..\src\mathlib.h" />
<ClInclude Include="..\..\src\core\picker.h" />
<ClInclude Include="..\..\src\core\prefs.h" />
<ClInclude Include="..\..\src\libs\easytab.h" />
<ClInclude Include="..\..\src\libs\gl.h" />
<ClInclude Include="..\..\src\libs\glew\glew.h" />
<ClInclude Include="..\..\src\libs\glew\wglew.h" />
<ClInclude Include="..\..\src\libs\imgui\imconfig.h" />
<ClInclude Include="..\..\src\libs\imgui\imgui.h" />
<ClInclude Include="..\..\src\libs\mathlib.h" />
<ClInclude Include="..\..\src\libs\stb_image.h" />
<ClInclude Include="..\..\src\libs\stb_image_write.h" />
<ClInclude Include="..\..\src\libs\stb_rect_pack.h" />
<ClInclude Include="..\..\src\libs\stb_textedit.h" />
<ClInclude Include="..\..\src\libs\stb_truetype.h" />
<ClInclude Include="..\..\src\libs\timer.h" />
<ClInclude Include="..\..\src\libs\types.h" />
<ClInclude Include="..\..\src\papaya_core.h" />
<ClInclude Include="..\..\src\papaya_platform.h" />
<ClInclude Include="..\..\src\picker.h" />
<ClInclude Include="..\..\src\prefs.h" />
<ClInclude Include="..\..\src\stb_image.h" />
<ClInclude Include="..\..\src\stb_image_write.h" />
<ClInclude Include="..\..\src\stb_rect_pack.h" />
<ClInclude Include="..\..\src\stb_textedit.h" />
<ClInclude Include="..\..\src\stb_truetype.h" />
<ClInclude Include="..\..\src\timer.h" />
<ClInclude Include="..\..\src\types.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -13,6 +13,18 @@
<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>
<Filter Include="Source Files\core">
<UniqueIdentifier>{d3e5d53f-5914-4fc4-bf92-9824ce442910}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\libs">
<UniqueIdentifier>{1a8d5a6e-3686-4b38-8087-4fc4be844e17}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\core">
<UniqueIdentifier>{f8bf9636-c6a4-4065-a6d3-05d66f8c1c61}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\libs">
<UniqueIdentifier>{6ad8a5c7-8d4b-4369-85e1-9d28c4760174}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Papaya.rc">
@@ -31,73 +43,76 @@
<ClCompile Include="..\..\src\papaya_core.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\picker.cpp">
<Filter>Source Files</Filter>
<ClCompile Include="..\..\src\core\picker.cpp">
<Filter>Source Files\core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\prefs.cpp">
<Filter>Source Files</Filter>
<ClCompile Include="..\..\src\core\prefs.cpp">
<Filter>Source Files\core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\single_libs.cpp">
<Filter>Source Files</Filter>
<ClCompile Include="..\..\src\libs\single_header_libs.cpp">
<Filter>Source Files\libs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\glew\glew.c">
<Filter>Source Files</Filter>
<ClCompile Include="..\..\src\libs\glew\glew.cpp">
<Filter>Source Files\libs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\imgui\imgui.cpp">
<Filter>Source Files</Filter>
<ClCompile Include="..\..\src\libs\imgui\imgui.cpp">
<Filter>Source Files\libs</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\imgui\imgui.h">
<ClInclude Include="..\..\src\papaya_core.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\glew\glew.h">
<ClInclude Include="..\..\src\papaya_platform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\glew\wglew.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\core\picker.h">
<Filter>Header Files\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\easytab.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\core\prefs.h">
<Filter>Header Files\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gl.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\easytab.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\mathlib.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\gl.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\papaya_core.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\mathlib.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\papaya_platform.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\stb_image.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\picker.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\stb_image_write.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\prefs.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\stb_rect_pack.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\stb_image.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\stb_textedit.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\stb_image_write.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\stb_truetype.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\stb_rect_pack.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\timer.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\stb_textedit.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\types.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\stb_truetype.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\glew\glew.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\timer.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\glew\wglew.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\types.h">
<Filter>Header Files</Filter>
<ClInclude Include="..\..\src\libs\imgui\imconfig.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libs\imgui\imgui.h">
<Filter>Header Files\libs</Filter>
</ClInclude>
</ItemGroup>
</Project>
@@ -1,7 +1,7 @@

#include "picker.h"
#include "imgui/imgui.h"
#include "mathlib.h"
#include "libs/imgui/imgui.h"
#include "libs/mathlib.h"
#include "papaya_core.h"

void Picker::Init(PickerInfo* Picker)
@@ -1,6 +1,6 @@
#pragma once

#include "types.h"
#include "libs/types.h"

struct PickerInfo
{
@@ -1,7 +1,7 @@

#include "prefs.h"
#include <stdio.h>
#include "imgui/imgui.h"
#include "libs/imgui/imgui.h"
#include "papaya_core.h"

void Prefs::ShowPanel(PickerInfo* Picker, Color* Colors, WindowInfo& Window)
@@ -1,7 +1,7 @@

#pragma once

#include "types.h"
#include "libs/types.h"

struct PickerInfo;
struct WindowInfo;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,6 @@
#pragma once

#include "types.h"
#include "libs/types.h"

// Implicit conversions between papaya_math.h structs and imgui.h structs
#define IM_VEC2_CLASS_EXTRA \
@@ -473,15 +473,15 @@ The list below consist mostly of notes of things to do before they are requested
- optimization: better clipping for multi-component widgets
*/

#include "imgui/imgui_draw.cpp"
#include "libs/imgui/imgui_draw.cpp"

#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS
#endif

#include "imgui.h"
#define IMGUI_DEFINE_MATH_OPERATORS
#include "imgui/imgui_internal.h"
#include "libs/imgui/imgui_internal.h"

#include <ctype.h> // toupper, isprint
#include <math.h> // sqrtf, fabsf, fmodf, powf, cosf, sinf, floorf, ceilf
@@ -6897,7 +6897,7 @@ namespace ImGuiStb
#define STB_TEXTEDIT_K_SHIFT 0x20000

#define STB_TEXTEDIT_IMPLEMENTATION
#include "stb_textedit.h"
#include "libs/stb_textedit.h"

}

@@ -9,7 +9,7 @@
#pragma once

#if !defined(IMGUI_DISABLE_INCLUDE_IMCONFIG_H) || defined(IMGUI_INCLUDE_IMCONFIG_H)
#include "imgui/imconfig.h" // User-editable configuration file
#include "libs/imgui/imconfig.h" // User-editable configuration file
#endif
#include <float.h> // FLT_MAX
#include <stdarg.h> // va_list
File renamed without changes.
@@ -59,7 +59,7 @@ namespace IMGUI_STB_NAMESPACE
#define STBRP_STATIC
#define STB_RECT_PACK_IMPLEMENTATION
#endif
#include "stb_rect_pack.h"
#include "libs/stb_rect_pack.h"

#define STBTT_malloc(x,u) ((void)(u), ImGui::MemAlloc(x))
#define STBTT_free(x,u) ((void)(u), ImGui::MemFree(x))
@@ -70,7 +70,7 @@ namespace IMGUI_STB_NAMESPACE
#else
#define STBTT_DEF extern
#endif
#include "stb_truetype.h"
#include "libs/stb_truetype.h"

#ifdef __clang__
#pragma clang diagnostic pop
@@ -53,7 +53,7 @@ namespace ImGuiStb
#define STB_TEXTEDIT_STRING ImGuiTextEditState
#define STB_TEXTEDIT_CHARTYPE ImWchar
#define STB_TEXTEDIT_GETWIDTH_NEWLINE -1.0f
#include "stb_textedit.h"
#include "libs/stb_textedit.h"

#ifdef __clang__
#pragma clang diagnostic pop
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,10 +1,11 @@

#include "papaya_core.h"
#include "glew/glew.h"
#include "stb_image.h"
#include "stb_image_write.h"
#include "imgui/imgui.h"
#include "mathlib.h"

#include "libs/glew/glew.h"
#include "libs/stb_image.h"
#include "libs/stb_image_write.h"
#include "libs/imgui/imgui.h"
#include "libs/mathlib.h"

internal uint32 AllocateEmptyTexture(int32 Width, int32 Height)
{
@@ -1,11 +1,11 @@
#pragma once

#include "papaya_platform.h"
#include "gl.h"
#include "timer.h"
#include "libs/gl.h"
#include "libs/timer.h"

#include "picker.h"
#include "prefs.h"
#include "core/picker.h"
#include "core/prefs.h"

struct ImDrawData;

@@ -1,6 +1,6 @@
#pragma once

#include "types.h"
#include "libs/types.h"

#if !defined(_DEBUG ) // TODO: Make this work for gcc
#define PAPAYARELEASE // User-ready release mode
@@ -16,6 +16,5 @@ namespace Platform
void SetCursorVisibility(bool Visible);
char* OpenFileDialog();
char* SaveFileDialog();

double GetMilliseconds();
}
@@ -9,10 +9,10 @@
#include "papaya_platform.h"
#include "papaya_core.h"

#include "glew/glew.h"
#include "glew/wglew.h"
#include "imgui/imgui.h"
#include "easytab.h"
#include "libs/glew/glew.h"
#include "libs/glew/wglew.h"
#include "libs/imgui/imgui.h"
#include "libs/easytab.h"

#ifndef PAPAYARELEASE
#define PAPAYA_DEFAULT_IMAGE "C:\\Users\\Apoorva\\Pictures\\ImageTest\\fruits.png"
BIN -3.56 KB web/patreon.png
Binary file not shown.

0 comments on commit 587f135

Please sign in to comment.
You can’t perform that action at this time.