Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change] Increase UI resolution to 800x600.

Browse Source
This commit is contained in:
Allanis 2018-01-21 12:16:03 +00:00
parent bed1c183c7
commit 6091e4f534
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
icons/cpanel.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

4
src/main.cpp
View File

@ -233,7 +233,7 @@ void L3D::MainLoop(void) {
station->SetPosition(vector3d(0,0,0)); station->SetPosition(vector3d(0,0,0));
Space::AddBody(station); Space::AddBody(station);
SpaceStation* station2 = new SpaceStation(SpaceStation::GROUND_FLAVOURED);; SpaceStation* station2 = new SpaceStation(SpaceStation::GROUND_FLAVOURED);
station2->SetLabel("Dfighter's point"); station2->SetLabel("Dfighter's point");
station2->SetFrame(*pframe->m_children.begin()); /* Rotating frame of planet. */ station2->SetFrame(*pframe->m_children.begin()); /* Rotating frame of planet. */
station2->OrientOnSurface(EARTH_RADIUS, M_PI/4, M_PI/4); station2->OrientOnSurface(EARTH_RADIUS, M_PI/4, M_PI/4);
@ -245,7 +245,7 @@ void L3D::MainLoop(void) {
//player->SetPosition(vector3d(0,0,2000)); //player->SetPosition(vector3d(0,0,2000));
//player->SetFrame(pframe); //player->SetFrame(pframe);
Gui::Init(scrWidth, scrHeight, 640, 480); Gui::Init(scrWidth, scrHeight, 800, 600);
cpan = new ShipCpanel(); cpan = new ShipCpanel();
cpan->ShowAll(); cpan->ShowAll();

2
src/sbre/brender.cpp
View File

@ -256,9 +256,7 @@ void sbreGenCollMesh(CollMesh* pCMesh, int model, ObjParams* pParam, float s) {
void GenCollMeshInternal(Vector* pPos, Matrix* pOrient, int model, ObjParams* pParam, void GenCollMeshInternal(Vector* pPos, Matrix* pOrient, int model, ObjParams* pParam,
float s, CollMesh* pCMesh) { float s, CollMesh* pCMesh) {
Model* pModel = ppModel[model]; Model* pModel = ppModel[model];
Vector* pVtx = (Vector*)alloca(sizeof(Vector)*(pModel->cvStart+pModel->numCVtx)); Vector* pVtx = (Vector*)alloca(sizeof(Vector)*(pModel->cvStart+pModel->numCVtx));
ResolveVertices(pModel, pVtx, pParam); ResolveVertices(pModel, pVtx, pParam);
#if 0 #if 0
for(int i = 6; i < pModel->cvStart+pModel->numCVtx; i++) { for(int i = 6; i < pModel->cvStart+pModel->numCVtx; i++) {

2
src/space_station.cpp
View File

@ -111,7 +111,7 @@ void SpaceStation::OrientLaunchingShip(Ship* ship) const {
const int dockMethod = stationTypes[m_type].dockMethod; const int dockMethod = stationTypes[m_type].dockMethod;
if(dockMethod == SpaceStationType::ORBITAL) { if(dockMethod == SpaceStationType::ORBITAL) {
/* /*
* Position ship in middle of docking bat, pointing out of it. * Position ship in middle of docking bay, pointing out of it.
* TODO: Need to do forced thrusting thing. * TODO: Need to do forced thrusting thing.
* TODO: ang vel not zeroed for some reason.. * TODO: ang vel not zeroed for some reason..
*/ */

6
src/view.h
View File

@ -11,16 +11,16 @@
*/ */
class View : public Gui::Fixed { class View : public Gui::Fixed {
public: public:
View(void) : Gui::Fixed(640, 416) { View(void) : Gui::Fixed(Gui::Screen::GetWidth(), Gui::Screen::GetHeight()-64) {
Gui::Screen::AddBaseWidget(this, 0, 64); Gui::Screen::AddBaseWidget(this, 0, 64);
m_rightButtonBar = new Gui::Fixed(128, 26); m_rightButtonBar = new Gui::Fixed(128, 26);
m_rightButtonBar->SetBgColor(.65, .65, .65); m_rightButtonBar->SetBgColor(.65, .65, .65);
Gui::Screen::AddBaseWidget(m_rightButtonBar, 512, 0); Gui::Screen::AddBaseWidget(m_rightButtonBar, Gui::Screen::GetWidth()-128, 0);
m_rightRegion2 = new Gui::Fixed(122, 17); m_rightRegion2 = new Gui::Fixed(122, 17);
m_rightRegion2->SetTransparency(true); m_rightRegion2->SetTransparency(true);
Gui::Screen::AddBaseWidget(m_rightRegion2, 517, 26); Gui::Screen::AddBaseWidget(m_rightRegion2, Gui::Screen::GetWidth()-123, 26);
} }
virtual ~View(void) { delete m_rightButtonBar; delete m_rightRegion2; } virtual ~View(void) { delete m_rightButtonBar; delete m_rightRegion2; }
virtual void ShowAll(void) { virtual void ShowAll(void) {