vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed include paths as emgui was moved. Fixed some more stuff in tundra scripts to remove deprecated warning

Browse Source
This commit is contained in:
Daniel Collin 2013-01-07 11:36:23 +01:00
parent d8ccff4aff
commit b8169418f2
18 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ogl_editor/emgui/include/emgui/Emgui.h
View File

@ -5,6 +5,8 @@
#include "Types.h"
#include "FontLayout.h"
struct EmguiFontLayout;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
enum EmguiSliderDirection
@ -111,7 +113,7 @@ bool Emgui_setFontByName(const char* ttfFontname);
int Emgui_loadFontTTF(const char* ttfFontname, float fontHeight);
int Emgui_loadFontBitmap(const char* buffer, int len, enum EmguiMemoryLocation location,
int rangeStart, int rangeEnd, EmguiFontLayout* layout);
int rangeStart, int rangeEnd, struct EmguiFontLayout* layout);
uint32_t Emgui_getTextSize(const char* text);
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

19
ogl_editor/emgui/include/emgui/FontLayout.h Normal file
View File

@ -0,0 +1,19 @@
#pragma once
#include "Types.h"
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
typedef struct EmguiFontLayout
{
int16_t id;
int16_t x;
int16_t y;
int16_t width;
int16_t height;
int16_t xoffset;
int16_t yoffset;
int16_t xadvance;
} EmguiFontLayout;

2
ogl_editor/src/Commands.c
View File

@ -1,11 +1,11 @@
#include "Commands.h"
#include "RemoteConnection.h"
#include "TrackData.h"
#include "Types.h"
#include "../../sync/sync.h"
#include "../../sync/track.h"
#include <stdlib.h>
#include <stdio.h>
#include <emgui/Types.h>
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

4
ogl_editor/src/Editor.c
View File

@ -1,11 +1,10 @@
#include "Editor.h"
#include <string.h>
#include <stdlib.h>
#include <Emgui.h>
#include <stdio.h>
#include <math.h>
#include "Menu.h"
#include "Dialog.h"
#include "Editor.h"
#include "LoadSave.h"
#include "TrackView.h"
#include "rlog.h"
@ -17,6 +16,7 @@
#include "../../sync/sync.h"
#include "../../sync/base.h"
#include "../../sync/data.h"
#include <emgui/emgui.h>
extern void Window_setTitle(const text_t* title);
extern void Window_populateRecentList(const text_t** files);

2
ogl_editor/src/Editor.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "Types.h"
#include <emgui/types.h>
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
ogl_editor/src/Menu.c
View File

@ -1,5 +1,5 @@
#include "Menu.h"
#include <Emgui.h>
#include <emgui/emgui.h>
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// On win32 (where we use unicode for text-strings) this is defined already

2
ogl_editor/src/MinecraftiaFont.c
View File

@ -1,4 +1,4 @@
#include <Emgui.h>
#include <emgui/emgui.h>
#include "MinecraftiaFont.h"
int g_minecraftiaFontSize = 713;

2
ogl_editor/src/MinecraftiaFont.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <Emgui.h>
#include <emgui/emgui.h>
extern EmguiFontLayout g_minecraftiaFontLayout[];
extern char g_minecraftiaFont[];

2
ogl_editor/src/RemoteConnection.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <Types.h>
#include <emgui/types.h>
struct track_key;
struct sync_track;

2
ogl_editor/src/TrackData.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "Types.h"
#include <emgui/types.h>
#include "../../sync/data.h"
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
ogl_editor/src/TrackView.c
View File

@ -1,5 +1,5 @@
#include "trackview.h"
#include <Emgui.h>
#include <emgui/emgui.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

2
ogl_editor/src/TrackView.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "Types.h"
#include <emgui/types.h>
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
ogl_editor/src/loadsave.c
View File

@ -4,9 +4,9 @@
#include "../external/mxml/mxml.h"
#include "RemoteConnection.h"
#include "../../sync/data.h"
#include <Types.h>
#include <stdio.h>
#include <stdlib.h>
#include <emgui/types.h>
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
ogl_editor/src/loadsave.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <Emgui.h>
#include <emgui/types.h>
struct TrackData;

2
ogl_editor/src/minmax.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "Types.h"
#include <emgui/types.h>
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

8
ogl_editor/src/windows/RocketWindow.c
View File

@ -5,8 +5,8 @@
#include "resource.h"
#include "afxres.h"
#include <string.h>
#include <Emgui.h>
#include <GFXBackend.h>
#include <emgui/emgui.h>
#include <emgui/gfxbackend.h>
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -157,6 +157,7 @@ bool createWindow(const wchar_t* title, int width, int height)
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*
static void buildSubMenu(HMENU menu, MenuDescriptor menuDesc[])
{
MenuDescriptor* desc = &menuDesc[0];
@ -180,13 +181,16 @@ static void buildSubMenu(HMENU menu, MenuDescriptor menuDesc[])
}
}
*/
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*
void Window_buildMenu()
{
HMENU menu = GetMenu(s_window);
}
*/
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
ogl_editor/tundra.lua
View File

@ -27,8 +27,6 @@ local win32 = {
Build {
Units = "units.lua",
SyntaxExtensions = { "tundra.syntax.glob", "tundra.syntax.osx-bundle" },
Configs = {
Config { Name = "macosx-clang", DefaultOnHost = "macosx", Inherit = macosx, Tools = { "clang-osx" } },
Config { Name = "win32-msvc", DefaultOnHost = { "windows" }, Inherit = win32, Tools = { "msvc" } },

29
ogl_editor/units.lua
View File

@ -1,8 +1,11 @@
require "tundra.syntax.glob"
require "tundra.syntax.osx-bundle"
StaticLibrary {
Name = "mxml",
Env = {
CPPPATH = { ".", "ogl_rocket/external/mxml" },
CPPPATH = { ".", "external/mxml" },
PROGOPTS = {
{ "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } },
},
@ -18,7 +21,7 @@ StaticLibrary {
Sources = {
Glob {
Dir = "ogl_editor/external/mxml",
Dir = "external/mxml",
Extensions = { ".c" },
},
},
@ -45,7 +48,7 @@ StaticLibrary {
Sources = {
FGlob {
Dir = "../emgui/src",
Dir = "emgui/src",
Extensions = { ".c" },
Filters = {
{ Pattern = "macosx"; Config = "macosx-*-*" },
@ -61,7 +64,7 @@ StaticLibrary {
Sources = {
Glob {
Dir = "sync",
Dir = "../sync",
Extensions = { ".c" },
},
},
@ -72,10 +75,9 @@ Program {
Name = "editor",
Env = {
CPPPATH = { ".", "ogl_editor/src",
"../emgui/src",
"../../../../../emgui/src",
"ogl_editor/External/mxml" },
CPPPATH = { ".", "src",
"emgui/include",
"External/mxml" },
PROGOPTS = {
{ "/SUBSYSTEM:WINDOWS", "/DEBUG"; Config = { "win32-*-*", "win64-*-*" } },
},
@ -92,8 +94,7 @@ Program {
Sources = {
FGlob {
Dir = "ogl_editor/src",
--Extensions = { ".c", { ".m"; Config = "macosx-*-*" } },
Dir = "src",
Extensions = { ".c", ".m" },
Filters = {
{ Pattern = "macosx"; Config = "macosx-*-*" },
@ -101,7 +102,7 @@ Program {
},
},
{ "ogl_editor/data/windows/editor.rc" ; Config = { "win32-*-*", "win64-*-*" } },
{ "data/windows/editor.rc" ; Config = { "win32-*-*", "win64-*-*" } },
},
Depends = { "sync", "mxml", "emgui" },
@ -116,11 +117,11 @@ local rocketBundle = OsxBundle
{
Depends = { "editor" },
Target = "$(OBJECTDIR)/RocketEditor.app",
InfoPList = "ogl_editor/data/macosx/Info.plist",
InfoPList = "data/macosx/Info.plist",
Executable = "$(OBJECTDIR)/editor",
Resources = {
CompileNib { Source = "ogl_editor/data/macosx/appnib.xib", Target = "appnib.nib" },
"ogl_editor/data/macosx/icon.icns",
CompileNib { Source = "data/macosx/appnib.xib", Target = "appnib.nib" },
"data/macosx/icon.icns",
},
}