Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add event-editing and sequence-editing support. #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add event-editing and sequence-editing support. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 137 additions & 27 deletions src/c/hlmv_event.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,156 @@
#include "hlmv.h"
#include "ViewerSettings.h"
#include "StudioModel.h"
#include <QVariant>
#include <QInputDialog>

void QtGuiApplication1::editEvents()
{
bool ok = false;

studiohdr_t *hdr = g_studioModel.getStudioHeader();

if (!hdr)
{
return;
}

int seq = ui.cEvent->currentData().toInt(&ok);

if (!ok)
{
seq = ui.cSequence->currentRow();
if (seq < 0 || seq >= hdr->numseq)
return;
}

QString str;

mstudioseqdesc_t *pseqdescs = (mstudioseqdesc_t *)(((byte *)hdr + hdr->seqindex)) + seq;

for (int i = 0; i < pseqdescs->numevents; ++i)
{
mstudioevent_t *pevents = (mstudioevent_t *)((byte *)hdr + pseqdescs->eventindex) + i;

str += QString("%1, %2, %3, %4\n")
.arg(pevents->frame)
.arg(pevents->event)
.arg(pevents->type)
.arg(pevents->event == 5004 ? QString(pevents->options) : "");
}

bool isOK = false;
QString text = QInputDialog::getMultiLineText(
this,
tr("Edit events"),
tr("Format: frame, event, type, options (string)"),
str,
&isOK);

if (isOK)
{
std::vector<mstudioevent_t> evlist;

QStringList lines = text.split("\n");

for (int i = 0; i < lines.size(); ++i)
{
QStringList evstr = lines[i].split(",");
if (evstr.size() == 4)
{
mstudioevent_t ev = {0};

ev.frame = evstr[0].trimmed().toInt(&isOK);
if (!isOK)
continue;

ev.event = evstr[1].trimmed().toInt(&isOK);
if (!isOK)
continue;

ev.type = evstr[2].trimmed().toInt(&isOK);
if (!isOK)
continue;

if (ev.event == 5004)
{
auto optstr = evstr[3].trimmed().toLocal8Bit();
memcpy(ev.options, optstr.data(), std::min(optstr.size(), 63) );
}
evlist.emplace_back(ev);
}
}

if (evlist.size() > 0)
{
if (pseqdescs->numevents < evlist.size())
{
int original_length = hdr->texturedataindex;
auto original_texturedata = ((byte *)hdr + hdr->texturedataindex);
int texturedata_length = hdr->length - hdr->texturedataindex;

int extend_length = sizeof(mstudioevent_t) * evlist.size();
hdr->texturedataindex += extend_length;
hdr->length += extend_length;

auto new_texturedata = ((byte *)hdr + hdr->texturedataindex);
memmove(new_texturedata, original_texturedata, texturedata_length);

pseqdescs->eventindex = original_length;

auto ptexture = (mstudiotexture_t *)((byte *)hdr + hdr->textureindex);
for (int i = 0; i < hdr->numtextures; i++)
{
ptexture->index += extend_length;
ptexture++;
}
}

if (pseqdescs->eventindex)
{
mstudioevent_t *pevents_new = (mstudioevent_t *)((byte *)hdr + pseqdescs->eventindex);
memcpy(pevents_new, evlist.data(), sizeof(mstudioevent_t) * evlist.size());
}
}
pseqdescs->numevents = evlist.size();
}
}

void QtGuiApplication1::setEventInfo(int index)
{
char str[1024];
QString str;

studiohdr_t *hdr = g_studioModel.getStudioHeader ();
studiohdr_t *hdr = g_studioModel.getStudioHeader();

if (!hdr)
{
ui.lEventInfo->setText("");
return;
}

mstudioseqdesc_t *pseqdescs = (mstudioseqdesc_t *) ((byte *)hdr + hdr->seqindex);
bool ok = false;

int seq = ui.cEvent->currentData().toInt(&ok);

if(!ui.cEvent->count())
if (!ok)
{
ui.lEventInfo->setText ("");
ui.lEventInfo->setText("");
return;
}

if (pseqdescs->numevents)
mstudioseqdesc_t *pseqdescs = (mstudioseqdesc_t *) (((byte *)hdr + hdr->seqindex)) + seq;

if (index >= 0 && index < pseqdescs->numevents)
{
mstudioevent_t *pevents = (mstudioevent_t *) ((byte *)hdr + pseqdescs->eventindex) + index;

sprintf (str,
"Frame: %d "
"Event: %d "
"Type: %d\n"
"Options: %s",
pevents->frame,
pevents->event,
pevents->type,
pevents->options
);
}
else
{
str[0] = '\0';
str = QString("Frame: %1, Event: %2, Type: %3\nOptions: %4")
.arg(pevents->frame)
.arg(pevents->event)
.arg(pevents->type)
.arg(pevents->event == 5004 ? QString(pevents->options) : "");
}

ui.lEventInfo->setText (str);
}

Expand All @@ -50,16 +163,13 @@ void QtGuiApplication1::setEvent (int seq)
if (!hdr)
return;

mstudioseqdesc_t *pseqdescs = (mstudioseqdesc_t *) ((byte *)hdr + hdr->seqindex); //g_viewerSettings.sequence;
mstudioseqdesc_t *pseqdescs = (mstudioseqdesc_t *) ((byte *)hdr + hdr->seqindex);

ui.cEvent->clear ();
if (0 < pseqdescs[seq].numevents)
for (int i = 0; i < pseqdescs[seq].numevents; i++)
{
for (int i = 1; i <= pseqdescs[seq].numevents; i++)
{
sprintf (str, "Event %d", i);
ui.cEvent->addItem (str);
}
sprintf(str, "Event %d", i);
ui.cEvent->addItem(str, QVariant(seq));
}
ui.cEvent->setCurrentIndex (0);
setEventInfo(0);
Expand Down
123 changes: 87 additions & 36 deletions src/c/hlmv_seq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,71 +1,122 @@
#include "hlmv.h"
#include "ViewerSettings.h"
#include "StudioModel.h"
#include <QInputDialog>

void QtGuiApplication1::initSequences ()
void QtGuiApplication1::editSequence()
{
studiohdr_t *hdr = g_studioModel.getStudioHeader ();
if (hdr)
studiohdr_t *hdr = g_studioModel.getStudioHeader();

if (!hdr)
return;

if (g_viewerSettings.sequence >= hdr->numseq || g_viewerSettings.sequence < 0)
return;

mstudioseqdesc_t *pseqdesc = (mstudioseqdesc_t *)((byte *)hdr + hdr->seqindex) + g_viewerSettings.sequence;

bool isOK = false;
QString str = QString("%1, %2")
.arg(pseqdesc->flags)
.arg(pseqdesc->fps);

QString text = QInputDialog::getMultiLineText(
this,
tr("Edit events"),
tr("Format: flags, fps"),
str,
&isOK);

if (isOK)
{
ui.cSequence->clear();
ui.cWpSequence->clear ();
for (int i = 0; i < hdr->numseq; i++)
QStringList seqstr = text.split(",");
if (seqstr.size() == 2)
{
mstudioseqdesc_t *pseqdescs = (mstudioseqdesc_t *) ((byte *) hdr + hdr->seqindex);
ui.cSequence->addItem (pseqdescs[i].label);
ui.cWpSequence->addItem (pseqdescs[i].label);
int flags = seqstr[0].trimmed().toInt(&isOK);
if (isOK)
pseqdesc->flags = flags;
float fps = seqstr[1].trimmed().toFloat(&isOK);
if (isOK)
pseqdesc->fps = fps;

setSequenceInfo();
}
}
}

ui.cSequence->setCurrentRow (0);
ui.cWpSequence->setCurrentIndex (0);
void QtGuiApplication1::initSequences ()
{
studiohdr_t *hdr = g_studioModel.getStudioHeader();

if (!hdr)
return;

ui.cSequence->clear();
ui.cWpSequence->clear ();

for (int i = 0; i < hdr->numseq; i++)
{
mstudioseqdesc_t *pseqdescs = (mstudioseqdesc_t *) ((byte *) hdr + hdr->seqindex);
ui.cSequence->addItem(pseqdescs[i].label);
ui.cWpSequence->addItem(pseqdescs[i].label);
}

ui.cSequence->setCurrentRow(0);
ui.cWpSequence->setCurrentIndex(0);
}

void QtGuiApplication1::setSequence(int index)
{
if(index < 0)
studiohdr_t *hdr = g_studioModel.getStudioHeader();

if (!hdr)
return;

if (index >= hdr->numseq || index < 0)
return;

ui.cSequence->setCurrentRow(index);
ui.cWpSequence->setCurrentIndex (index);

g_studioModel.SetSequence(index);
g_viewerSettings.sequence = index;
setSequenceInfo ();
setSequenceInfo();
setEvent (index);
}

void QtGuiApplication1::setSequenceInfo ()
void QtGuiApplication1::setSequenceInfo()
{
char str[1024];

studiohdr_t *hdr = g_studioModel.getStudioHeader ();

if (!hdr)
return;

if (g_viewerSettings.sequence >= hdr->numseq || g_viewerSettings.sequence < 0)
return;

mstudioseqdesc_t *pseqdesc = (mstudioseqdesc_t *) ((byte *) hdr + hdr->seqindex) + g_viewerSettings.sequence;

sprintf (str,
"Sequence#: %d\n"
"Frames: %d\n"
"FPS: %d\n"
"Blends: %d\n"
"# of events: %d\n",
g_viewerSettings.sequence,
pseqdesc->numframes,
(int)pseqdesc->fps,
pseqdesc->numblends,
pseqdesc->numevents
);

ui.lSequenceInfo1->setText (str);
ui.lSequenceInfo2->setText (str);

ui.slFrame->setRange(0, pseqdesc->numframes);
ui.leFrame->setRange(0, pseqdesc->numframes);
ui.slWeaponFrame->setRange(0, pseqdesc->numframes);
ui.leWeaponFrame->setRange(0, pseqdesc->numframes);
auto str = QString(
"Sequence: %1\n"
"Flags: %2\n"
"FPS: %3\n"
"NumofFrames: %4\n"
"NumofBlends: %5\n"
"NumofEvents: %6\n")
.arg(g_viewerSettings.sequence)
.arg(pseqdesc->flags)
.arg(pseqdesc->fps)
.arg(pseqdesc->numframes)
.arg(pseqdesc->numblends)
.arg(pseqdesc->numevents);

ui.lSequenceInfo1->setText(str);
ui.lSequenceInfo2->setText(str);

ui.slFrame->setRange(0, pseqdesc->numframes - 1);
ui.leFrame->setRange(0, pseqdesc->numframes - 1);
ui.slWeaponFrame->setRange(0, pseqdesc->numframes - 1);
ui.leWeaponFrame->setRange(0, pseqdesc->numframes - 1);

ui.slWpSpeedFPS->setValue(pseqdesc->fps);
ui.slWpSpeedFPS->setRange(0, pseqdesc->fps * 10);
Expand Down
Loading